From 3f79c91217b83781d9109984aeeb111fec2ef44d Mon Sep 17 00:00:00 2001
From: Steve Gordon <sgordon@hotmail.co.uk>
Date: Wed, 22 Jun 2022 17:47:28 +0200
Subject: [PATCH] Respond to data schema improvements (#6465)

* Respond to most date changes

* Support spec changes such as stringified
---
 .../AsyncSearch/AsyncSearchStatusResponse.cs  |  17 ---
 .../Api/AsyncSearch/GetAsyncSearchResponse.cs |  17 ---
 .../Time.cs => DateTime/Duration.cs}          |  66 ++++-----
 .../Common/{TimeUnit => DateTime}/TimeUnit.cs |   0
 .../Common/DateTimeUtil.cs                    |  43 ------
 .../DataStreamNames/DataStreamName.cs         |   2 +-
 .../UrlParameters/ScrollIds/ScrollId.cs       |  79 +++++++++++
 .../UrlParameters/ScrollIds/ScrollIds.cs      | 121 ++++++++++++++++
 .../Helpers/BulkAllRequest.cs                 |  16 +--
 .../Helpers/IBulkAllRequest.cs                |   4 +-
 .../Serialization/Stringified.cs              |  32 +++++
 .../AsyncSearchStatusResponse.g.cs            |  13 +-
 .../AsyncSearch/AsyncSearchSubmitRequest.g.cs |  24 ++--
 .../AsyncSearchSubmitResponse.g.cs            |  13 +-
 .../AsyncSearch/GetAsyncSearchRequest.g.cs    |  16 +--
 .../AsyncSearch/GetAsyncSearchResponse.g.cs   |  13 +-
 .../_Generated/Api/BulkRequest.g.cs           |   8 +-
 .../_Generated/Api/Ccr/CcrFollowRequest.g.cs  |  20 +--
 .../Ccr/CcrPutAutoFollowPatternRequest.g.cs   |  12 +-
 .../Api/Ccr/CcrResumeFollowRequest.g.cs       |  20 +--
 .../ClusterAllocationExplainResponse.g.cs     |   6 +-
 ...ClusterDeleteComponentTemplateRequest.g.cs |  12 +-
 ...ClusterExistsComponentTemplateRequest.g.cs |   6 +-
 .../ClusterGetComponentTemplateRequest.g.cs   |   6 +-
 .../Cluster/ClusterGetSettingsRequest.g.cs    |  12 +-
 .../Api/Cluster/ClusterHealthRequest.g.cs     |  16 +--
 .../Api/Cluster/ClusterHealthResponse.g.cs    |   6 +-
 .../Cluster/ClusterPendingTasksRequest.g.cs   |   6 +-
 ...sterPostVotingConfigExclusionsRequest.g.cs |   6 +-
 .../ClusterPutComponentTemplateRequest.g.cs   |   8 +-
 .../Cluster/ClusterPutSettingsRequest.g.cs    |  12 +-
 .../Api/Cluster/ClusterRerouteRequest.g.cs    |  12 +-
 .../Api/Cluster/ClusterStateRequest.g.cs      |  16 +--
 .../Api/Cluster/ClusterStatsRequest.g.cs      |   6 +-
 .../_Generated/Api/CreateRequest.g.cs         |   6 +-
 .../_Generated/Api/DeleteByQueryRequest.g.cs  |  32 ++---
 .../_Generated/Api/DeleteByQueryResponse.g.cs |  12 +-
 .../Api/DeleteByQueryRethrottleRequest.g.cs   |   6 +-
 .../_Generated/Api/DeleteRequest.g.cs         |   8 +-
 .../_Generated/Api/DeleteScriptRequest.g.cs   |  16 +--
 .../Api/Eql/EqlGetStatusResponse.g.cs         |   4 +-
 .../_Generated/Api/Eql/EqlSearchRequest.g.cs  |  20 +--
 .../_Generated/Api/Eql/EqlSearchResponse.g.cs |   2 +-
 .../_Generated/Api/Eql/GetEqlRequest.g.cs     |  16 +--
 .../_Generated/Api/Eql/GetEqlResponse.g.cs    |   2 +-
 .../Api/Graph/GraphExploreRequest.g.cs        |   8 +-
 .../Api/Ilm/IlmDeleteLifecycleRequest.g.cs    |  12 +-
 .../Api/Ilm/IlmExplainLifecycleRequest.g.cs   |  16 +--
 .../Api/Ilm/IlmGetLifecycleRequest.g.cs       |  12 +-
 .../Api/Ilm/IlmPutLifecycleRequest.g.cs       |  12 +-
 .../_Generated/Api/Ilm/IlmStartRequest.g.cs   |  12 +-
 .../_Generated/Api/Ilm/IlmStopRequest.g.cs    |  12 +-
 .../Api/IndexManagement/CloneRequest.g.cs     |  16 +--
 .../Api/IndexManagement/CloseRequest.g.cs     |  16 +--
 .../Api/IndexManagement/CreateRequest.g.cs    |  16 +--
 .../IndexManagement/DeleteAliasRequest.g.cs   |  16 +--
 .../DeleteIndexTemplateRequest.g.cs           |  12 +-
 .../Api/IndexManagement/DeleteRequest.g.cs    |  16 +--
 .../DeleteTemplateRequest.g.cs                |  12 +-
 .../ExistsIndexTemplateRequest.g.cs           |   6 +-
 .../ExistsTemplateRequest.g.cs                |   6 +-
 .../Api/IndexManagement/GetRequest.g.cs       |   8 +-
 .../IndexManagement/IndexTemplateRequest.g.cs |   6 +-
 .../Api/IndexManagement/MappingRequest.g.cs   |   8 +-
 .../Api/IndexManagement/OpenRequest.g.cs      |  16 +--
 .../Api/IndexManagement/PutAliasRequest.g.cs  |  16 +--
 .../IndexManagement/PutMappingRequest.g.cs    |  16 +--
 .../IndexManagement/PutSettingsRequest.g.cs   |  16 +--
 .../IndexManagement/PutTemplateRequest.g.cs   |  12 +-
 .../Api/IndexManagement/RolloverRequest.g.cs  |  12 +-
 .../Api/IndexManagement/SettingsRequest.g.cs  |   8 +-
 .../Api/IndexManagement/ShrinkRequest.g.cs    |  16 +--
 .../SimulateIndexTemplateRequest.g.cs         |   8 +-
 .../SimulateTemplateRequest.g.cs              |   6 +-
 .../Api/IndexManagement/SplitRequest.g.cs     |  16 +--
 .../Api/IndexManagement/TemplateRequest.g.cs  |   6 +-
 .../_Generated/Api/IndexRequest.g.cs          |   6 +-
 .../Ingest/IngestDeletePipelineRequest.g.cs   |  16 +--
 .../Api/Ingest/IngestGetPipelineRequest.g.cs  |   8 +-
 .../Api/Ingest/IngestPutPipelineRequest.g.cs  |  24 ++--
 .../_Generated/Api/Ml/MlCloseJobRequest.g.cs  |   6 +-
 .../Ml/MlDeleteDataFrameAnalyticsRequest.g.cs |   8 +-
 .../Api/Ml/MlDeleteExpiredDataRequest.g.cs    |   6 +-
 .../Api/Ml/MlDeleteForecastRequest.g.cs       |   6 +-
 .../_Generated/Api/Ml/MlFlushJobRequest.g.cs  |  40 +++---
 .../_Generated/Api/Ml/MlForecastRequest.g.cs  |  12 +-
 .../Api/Ml/MlGetCalendarEventsRequest.g.cs    |  12 +-
 .../Api/Ml/MlGetInfluencersRequest.g.cs       |  16 +--
 .../Api/Ml/MlGetMemoryStatsRequest.g.cs       |  12 +-
 .../Api/Ml/MlGetModelSnapshotsRequest.g.cs    |  20 +--
 .../Api/Ml/MlGetOverallBucketsRequest.g.cs    |  18 +--
 .../Api/Ml/MlGetRecordsRequest.g.cs           |  20 +--
 .../_Generated/Api/Ml/MlOpenJobRequest.g.cs   |   6 +-
 .../Api/Ml/MlPutDatafeedRequest.g.cs          |  20 +--
 .../Api/Ml/MlPutDatafeedResponse.g.cs         |   4 +-
 .../_Generated/Api/Ml/MlPutJobRequest.g.cs    |  26 ++--
 .../_Generated/Api/Ml/MlPutJobResponse.g.cs   |   5 +-
 .../Api/Ml/MlPutTrainedModelResponse.g.cs     |   3 +-
 .../Api/Ml/MlSetUpgradeModeRequest.g.cs       |   6 +-
 .../Ml/MlStartDataFrameAnalyticsRequest.g.cs  |   8 +-
 .../Api/Ml/MlStartDatafeedRequest.g.cs        |  18 +--
 .../Ml/MlStopDataFrameAnalyticsRequest.g.cs   |   8 +-
 .../Api/Ml/MlStopDatafeedRequest.g.cs         |   6 +-
 .../Api/Ml/MlUpdateDatafeedRequest.g.cs       |  20 +--
 .../Api/Ml/MlUpdateDatafeedResponse.g.cs      |   4 +-
 .../_Generated/Api/Ml/MlUpdateJobRequest.g.cs |  10 +-
 .../Api/Ml/MlUpdateJobResponse.g.cs           |   6 +-
 .../Api/Ml/MlUpgradeJobSnapshotRequest.g.cs   |   6 +-
 .../Api/Nodes/NodesHotThreadsRequest.g.cs     |  18 +--
 .../Api/Nodes/NodesInfoRequest.g.cs           |  12 +-
 .../NodesReloadSecureSettingsRequest.g.cs     |   6 +-
 .../Api/Nodes/NodesStatsRequest.g.cs          |  16 +--
 .../Api/Nodes/NodesUsageRequest.g.cs          |   6 +-
 .../Api/OpenPointInTimeRequest.g.cs           |   8 +-
 .../_Generated/Api/PutScriptRequest.g.cs      |  16 +--
 .../_Generated/Api/ReindexRequest.g.cs        |  24 ++--
 .../_Generated/Api/ReindexResponse.g.cs       |   8 +-
 .../Api/ReindexRethrottleRequest.g.cs         |   6 +-
 .../_Generated/Api/ScriptRequest.g.cs         |   8 +-
 .../_Generated/Api/ScrollRequest.g.cs         |   6 +-
 .../_Generated/Api/SearchRequest.g.cs         |   8 +-
 .../SearchableSnapshotsMountRequest.g.cs      |   6 +-
 .../Security/SecurityGrantApiKeyResponse.g.cs |   2 +-
 .../Api/Slm/SlmGetStatsResponse.g.cs          |   4 +-
 .../Api/Slm/SlmPutLifecycleRequest.g.cs       |  12 +-
 .../Api/Snapshot/CreateSnapshotRequest.g.cs   |   6 +-
 .../Api/Snapshot/DeleteSnapshotRequest.g.cs   |   6 +-
 .../Api/Snapshot/GetSnapshotRequest.g.cs      |   6 +-
 .../SnapshotCleanupRepositoryRequest.g.cs     |  12 +-
 .../Api/Snapshot/SnapshotCloneRequest.g.cs    |  12 +-
 .../SnapshotCreateRepositoryRequest.g.cs      |  12 +-
 .../SnapshotDeleteRepositoryRequest.g.cs      |  12 +-
 .../SnapshotGetRepositoryRequest.g.cs         |   6 +-
 .../Api/Snapshot/SnapshotRestoreRequest.g.cs  |   8 +-
 .../Api/Snapshot/SnapshotStatusRequest.g.cs   |   6 +-
 .../SnapshotVerifyRepositoryRequest.g.cs      |  12 +-
 .../Api/Sql/SqlGetAsyncRequest.g.cs           |  16 +--
 .../_Generated/Api/Sql/SqlQueryRequest.g.cs   |  48 +++----
 .../_Generated/Api/TermsEnumRequest.g.cs      |  10 +-
 .../TransformDeleteTransformRequest.g.cs      |   6 +-
 .../TransformPreviewTransformRequest.g.cs     |  18 +--
 .../TransformPutTransformRequest.g.cs         |  18 +--
 .../TransformStartTransformRequest.g.cs       |   6 +-
 .../TransformStopTransformRequest.g.cs        |   6 +-
 .../TransformUpdateTransformRequest.g.cs      |  18 +--
 .../TransformUpdateTransformResponse.g.cs     |   2 +-
 .../TransformUpgradeTransformsRequest.g.cs    |   6 +-
 .../_Generated/Api/UpdateByQueryRequest.g.cs  |  32 ++---
 .../_Generated/Api/UpdateByQueryResponse.g.cs |   8 ++
 .../Api/UpdateByQueryRethrottleRequest.g.cs   |   6 +-
 .../_Generated/Api/UpdateRequest.g.cs         |   6 +-
 .../Api/Xpack/XpackUsageRequest.g.cs          |   6 +-
 .../AutoDateHistogramAggregation.g.cs         |  24 ++--
 .../DateHistogramAggregation.g.cs             |  97 ++++---------
 .../Aggregations/DateHistogramBucket.g.cs     |   6 +-
 .../Aggregations/DateRangeAggregation.g.cs    |  12 +-
 .../_Generated/Types/BulkStats.g.cs           |   4 +-
 .../Types/Ccr/AutoFollowedCluster.g.cs        |   2 +-
 .../_Generated/Types/Ccr/FollowerIndex.g.cs   |   4 -
 .../Types/Ccr/FollowerIndexParameters.g.cs    |   4 +-
 .../_Generated/Types/Ccr/ShardStats.g.cs      |  24 +++-
 .../Types/Cluster/CharFilterTypes.g.cs        |   4 -
 .../Types/Cluster/ClusterProcessor.g.cs       |   4 +
 .../Types/Cluster/ComponentTemplate.g.cs      |   4 -
 .../Types/Cluster/ComponentTemplateNode.g.cs  |  41 ------
 .../Cluster/ComponentTemplateSummary.g.cs     |  49 -------
 .../_Generated/Types/Cluster/PendingTask.g.cs |   4 +-
 .../Types/Cluster/UnassignedInformation.g.cs  |   2 +-
 .../Types/DanglingIndices/DanglingIndex.g.cs  |   2 +-
 .../_Generated/Types/DateOrEpochMillis.g.cs   |  38 -----
 .../Types/ElasticsearchVersionInfo.g.cs       |   2 +-
 .../_Generated/Types/FlushStats.g.cs          |   2 +-
 .../_Generated/Types/GetStats.g.cs            |   6 +-
 .../Types/Graph/ExploreControls.g.cs          |  10 +-
 .../Types/Ilm/LifecycleExplainManaged.g.cs    |  42 ++++--
 .../Ilm/LifecycleExplainPhaseExecution.g.cs   |   2 +-
 .../_Generated/Types/Ilm/Phase.g.cs           |   2 +-
 .../Types/IndexManagement/IndexSettings.g.cs  |  41 +++---
 .../IndexSettingsLifecycleStep.g.cs           |   6 +-
 .../IndexSettingsTimeSeries.g.cs              |  12 +-
 .../Types/IndexManagement/RetentionLease.g.cs |   6 +-
 .../IndexManagement/RolloverConditions.g.cs   |  12 +-
 .../Types/IndexManagement/SearchIdle.g.cs     |   6 +-
 .../Types/IndexManagement/ShardStats.g.cs     |   4 -
 .../SlowlogTresholdLevels.g.cs                |  24 ++--
 .../Types/IndexManagement/Translog.g.cs       |   6 +-
 .../IndexManagement/TranslogRetention.g.cs    |   6 +-
 .../_Generated/Types/IndexingStats.g.cs       |   6 +-
 .../Types/Ingest/GeoIpDownloadStatistics.g.cs |   2 +-
 .../_Generated/Types/Ingest/Ingest.g.cs       |   2 +-
 .../_Generated/Types/License/License.g.cs     |  18 +--
 .../Types/License/LicenseInformation.g.cs     |  10 +-
 .../Types/Mapping/DateNanosProperty.g.cs      |  10 +-
 .../Types/Mapping/DateProperty.g.cs           |  10 +-
 .../_Generated/Types/MergesStats.g.cs         |   6 +-
 .../Types/Migration/MigrationFeature.g.cs     |  12 ++
 .../_Generated/Types/Ml/AnalysisConfig.g.cs   |  30 ++--
 .../Types/Ml/AnalysisConfigRead.g.cs          |   6 +-
 .../_Generated/Types/Ml/Anomaly.g.cs          |   4 +-
 .../_Generated/Types/Ml/CalendarEvent.g.cs    |  12 +-
 .../_Generated/Types/Ml/ChunkingConfig.g.cs   |   6 +-
 .../_Generated/Types/Ml/Datafeed.g.cs         |   4 +-
 .../_Generated/Types/Ml/DatafeedConfig.g.cs   |  20 +--
 .../DataframeAnalyticsStatsMemoryUsage.g.cs   |   2 +-
 .../Types/Ml/DelayedDataCheckConfig.g.cs      |   6 +-
 .../_Generated/Types/Ml/Influencer.g.cs       |   2 +-
 .../_Generated/Types/Ml/JobConfig.g.cs        |  10 +-
 .../_Generated/Types/Ml/JobStats.g.cs         |   2 +-
 .../_Generated/Types/Ml/ModelSizeStats.g.cs   |   2 +-
 .../_Generated/Types/Ml/OverallBucket.g.cs    |   6 +-
 .../Types/Ml/TrainedModelInferenceStats.g.cs  |   2 +-
 .../_Generated/Types/Ml/Weights.g.cs          |  15 --
 .../Types/Nodes/ClusterStateUpdate.g.cs       |  16 +--
 .../_Generated/Types/Nodes/Context.g.cs       |   4 -
 .../_Generated/Types/Nodes/Cpu.g.cs           |   6 +-
 .../Types/Nodes/NodeOperatingSystemInfo.g.cs  |   2 +-
 .../Types/Nodes/NodeThreadPoolInfo.g.cs       |   2 +-
 .../_Generated/Types/Nodes/NodeUsage.g.cs     |   4 +-
 .../_Generated/Types/Nodes/Recording.g.cs     |   2 +-
 .../Types/PointInTimeReference.g.cs           |   6 +-
 .../_Generated/Types/RecoveryStats.g.cs       |   2 +-
 .../_Generated/Types/RefreshStats.g.cs        |   2 +-
 .../_Generated/Types/ReindexStatus.g.cs       |   8 ++
 .../_Generated/Types/RemoteSource.g.cs        |  12 +-
 .../_Generated/Types/SearchStats.g.cs         |  16 +++
 .../Types/Security/GrantApiKey.g.cs           |   6 +-
 .../_Generated/Types/Slm/Retention.g.cs       |   6 +-
 .../_Generated/Types/Slm/Statistics.g.cs      |   4 +-
 .../Types/Snapshot/ShardsStatsSummary.g.cs    |   4 +
 .../Types/Snapshot/SnapshotInfo.g.cs          |  12 +-
 .../Types/Snapshot/SnapshotStats.g.cs         |   4 +
 .../_Generated/Types/Tasks/TaskInfo.g.cs      |   2 +-
 .../_Generated/Types/Tasks/TaskStatus.g.cs    |   4 +-
 .../TransformManagement/CheckpointStats.g.cs  |   8 +-
 .../TransformManagement/Checkpointing.g.cs    |   2 +-
 .../TransformManagement/RetentionPolicy.g.cs  |  10 +-
 .../Types/TransformManagement/TimeSync.g.cs   |  10 +-
 .../TransformIndexerStats.g.cs                |   2 +-
 .../TransformManagement/TransformSummary.g.cs |   4 +-
 .../_Generated/Types/WarmerStats.g.cs         |   2 +-
 .../Types/Xpack/BuildInformation.g.cs         |   2 +-
 .../_Generated/Types/Xpack/DataStreams.g.cs   |   4 -
 .../Xpack/MinimalLicenseInformation.g.cs      |   2 +-
 .../Types/Xpack/WatcherActionTotals.g.cs      |   2 +-
 .../DateHistogramAggregationUsageTests.cs     |   8 +-
 .../Tests/AsyncSearch/AsyncSearchApiTests.cs  |  12 +-
 ...usterHealthResponseDeserialisationTests.cs |   2 +-
 .../ClusterHealthShardsApiTests.cs            |   2 +-
 tests/Tests/Common/TimeUnit/TimeUnits.cs      | 132 +++++++++---------
 .../Tests/Eql/EqlSearchApiCoordinatedTests.cs |   4 +-
 .../BucketSubAggregationSerializationTests.cs |   2 +-
 .../IndexSettingsSerialisationTests.cs        |  39 ++++++
 ...sts.CanSerialize_CreationDate.verified.txt |   3 +
 ...CanSerialize_NullCreationDate.verified.txt |   1 +
 254 files changed, 1628 insertions(+), 1490 deletions(-)
 delete mode 100644 src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/AsyncSearchStatusResponse.cs
 delete mode 100644 src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/GetAsyncSearchResponse.cs
 rename src/Elastic.Clients.Elasticsearch/Common/{TimeUnit/Time.cs => DateTime/Duration.cs} (84%)
 rename src/Elastic.Clients.Elasticsearch/Common/{TimeUnit => DateTime}/TimeUnit.cs (100%)
 create mode 100644 src/Elastic.Clients.Elasticsearch/Common/UrlParameters/ScrollIds/ScrollId.cs
 create mode 100644 src/Elastic.Clients.Elasticsearch/Common/UrlParameters/ScrollIds/ScrollIds.cs
 create mode 100644 src/Elastic.Clients.Elasticsearch/Serialization/Stringified.cs
 delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplateNode.g.cs
 delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplateSummary.g.cs
 delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/DateOrEpochMillis.g.cs
 create mode 100644 tests/Tests/Serialization/Indices/IndexSettingsSerialisationTests.cs
 create mode 100644 tests/Tests/_VerifySnapshots/IndexSettingsSerializationTests.CanSerialize_CreationDate.verified.txt
 create mode 100644 tests/Tests/_VerifySnapshots/IndexSettingsSerializationTests.CanSerialize_NullCreationDate.verified.txt

diff --git a/src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/AsyncSearchStatusResponse.cs b/src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/AsyncSearchStatusResponse.cs
deleted file mode 100644
index 8a298a535e7..00000000000
--- a/src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/AsyncSearchStatusResponse.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json.Serialization;
-
-namespace Elastic.Clients.Elasticsearch.AsyncSearch;
-
-public partial class AsyncSearchStatusResponse
-{
-	[JsonIgnore]
-	public DateTimeOffset StartTime => StartTimeInMillis.DateTimeOffset;
-
-	[JsonIgnore]
-	public DateTimeOffset ExpirationTime => ExpirationTimeInMillis.DateTimeOffset;
-}
diff --git a/src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/GetAsyncSearchResponse.cs b/src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/GetAsyncSearchResponse.cs
deleted file mode 100644
index cb7b72d3bb1..00000000000
--- a/src/Elastic.Clients.Elasticsearch/Api/AsyncSearch/GetAsyncSearchResponse.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text.Json.Serialization;
-
-namespace Elastic.Clients.Elasticsearch.AsyncSearch;
-
-public partial class GetAsyncSearchResponse<TDocument>
-{
-	[JsonIgnore]
-	public DateTimeOffset StartTime => StartTimeInMillis.DateTimeOffset;
-
-	[JsonIgnore]
-	public DateTimeOffset ExpirationTime => ExpirationTimeInMillis.DateTimeOffset;
-}
diff --git a/src/Elastic.Clients.Elasticsearch/Common/TimeUnit/Time.cs b/src/Elastic.Clients.Elasticsearch/Common/DateTime/Duration.cs
similarity index 84%
rename from src/Elastic.Clients.Elasticsearch/Common/TimeUnit/Time.cs
rename to src/Elastic.Clients.Elasticsearch/Common/DateTime/Duration.cs
index 9d7fd801f50..c419e74112d 100644
--- a/src/Elastic.Clients.Elasticsearch/Common/TimeUnit/Time.cs
+++ b/src/Elastic.Clients.Elasticsearch/Common/DateTime/Duration.cs
@@ -12,10 +12,10 @@
 namespace Elastic.Clients.Elasticsearch;
 
 /// <summary>
-/// Represents a time value
+/// Represents a duration value.
 /// </summary>
-[JsonConverter(typeof(TimeConverter))]
-public sealed class Time : IComparable<Time>, IEquatable<Time>, IUrlParameter
+[JsonConverter(typeof(DurationConverter))]
+public sealed class Duration : IComparable<Duration>, IEquatable<Duration>, IUrlParameter
 {
 	private const double MicrosecondsInATick = 0.1; // 10 ticks = 1 microsecond
 	private const double MillisecondsInADay = MillisecondsInAnHour * 24;
@@ -40,7 +40,7 @@ public sealed class Time : IComparable<Time>, IEquatable<Time>, IUrlParameter
 
 	private static readonly double FLOAT_TOLERANCE = 1e-7; // less than 1 nanosecond
 
-	private Time(int specialFactor, bool specialValue)
+	private Duration(int specialFactor, bool specialValue)
 	{
 		if (!specialValue)
 			throw new ArgumentException("this constructor is only for static TimeValues");
@@ -48,10 +48,10 @@ private Time(int specialFactor, bool specialValue)
 		StaticTimeValue = specialFactor;
 	}
 
-	public Time(TimeSpan timeSpan)
+	public Duration(TimeSpan timeSpan)
 		: this(timeSpan.TotalMilliseconds) { }
 
-	public Time(double milliseconds)
+	public Duration(double milliseconds)
 	{
 		if (Math.Abs(milliseconds - -1) < FLOAT_TOLERANCE)
 			StaticTimeValue = -1;
@@ -61,14 +61,14 @@ public Time(double milliseconds)
 			Reduce(milliseconds);
 	}
 
-	public Time(double factor, TimeUnit interval)
+	public Duration(double factor, TimeUnit interval)
 	{
 		Factor = factor;
 		Interval = interval;
 		Milliseconds = GetExactMilliseconds(Factor.Value, Interval.Value);
 	}
 
-	public Time(string timeUnit)
+	public Duration(string timeUnit)
 	{
 		if (timeUnit.IsNullOrEmpty())
 			throw new ArgumentException("Expression string is empty", nameof(timeUnit));
@@ -85,17 +85,17 @@ public Time(string timeUnit)
 
 	public double? Milliseconds { get; private set; }
 
-	public static Time MinusOne { get; } = new Time(-1, true);
+	public static Duration MinusOne { get; } = new Duration(-1, true);
 
-	public static Time Zero { get; } = new Time(0, true);
+	public static Duration Zero { get; } = new Duration(0, true);
 
 	private int? StaticTimeValue { get; }
 
-	public static implicit operator Time(TimeSpan span) => new(span);
+	public static implicit operator Duration(TimeSpan span) => new(span);
 
-	public static implicit operator Time(double milliseconds) => new(milliseconds);
+	public static implicit operator Duration(double milliseconds) => new(milliseconds);
 
-	public static implicit operator Time(string expression) => new(expression);
+	public static implicit operator Duration(string expression) => new(expression);
 
 	private void ParseExpression(string timeUnit)
 	{
@@ -147,7 +147,7 @@ private void ParseExpression(string timeUnit)
 		Milliseconds = GetExactMilliseconds(Factor.Value, Interval.Value);
 	}
 
-	public int CompareTo(Time other)
+	public int CompareTo(Duration other)
 	{
 		if (other == null)
 			return 1;
@@ -182,21 +182,21 @@ public int CompareTo(Time other)
 
 	private static bool IsIntegerGreaterThanZero(double d) => Math.Abs(d % 1) < double.Epsilon;
 
-	public static bool operator <(Time left, Time right) => left.CompareTo(right) < 0;
+	public static bool operator <(Duration left, Duration right) => left.CompareTo(right) < 0;
 
-	public static bool operator <=(Time left, Time right) => left.CompareTo(right) < 0 || left.Equals(right);
+	public static bool operator <=(Duration left, Duration right) => left.CompareTo(right) < 0 || left.Equals(right);
 
-	public static bool operator >(Time left, Time right) => left.CompareTo(right) > 0;
+	public static bool operator >(Duration left, Duration right) => left.CompareTo(right) > 0;
 
-	public static bool operator >=(Time left, Time right) => left.CompareTo(right) > 0 || left.Equals(right);
+	public static bool operator >=(Duration left, Duration right) => left.CompareTo(right) > 0 || left.Equals(right);
 
-	public static bool operator ==(Time left, Time right) =>
+	public static bool operator ==(Duration left, Duration right) =>
 		ReferenceEquals(left, null) ? right is null : left.Equals(right);
 
-	public static bool operator !=(Time left, Time right) => !(left == right);
+	public static bool operator !=(Duration left, Duration right) => !(left == right);
 
 	/// <summary>
-	/// Converts this instance of <see cref="Time" /> to an instance of <see cref="TimeSpan" />.
+	/// Converts this instance of <see cref="Duration" /> to an instance of <see cref="TimeSpan" />.
 	/// For values in <see cref="TimeUnit.Microseconds" /> and <see cref="TimeUnit.Nanoseconds" />, value will be rounded to
 	/// the nearest Tick.
 	/// All other values will be rounded to the nearest Millisecond.
@@ -206,7 +206,7 @@ public int CompareTo(Time other)
 	/// special time values <see cref="MinusOne" /> and <see cref="Zero" /> do not have a <see cref="TimeSpan" />
 	/// representation.
 	/// </para>
-	/// <para>instance of <see cref="Time" /> has no value for <see cref="Interval" /></para>
+	/// <para>instance of <see cref="Duration" /> has no value for <see cref="Interval" /></para>
 	/// </exception>
 	public TimeSpan ToTimeSpan()
 	{
@@ -256,7 +256,7 @@ string IUrlParameter.GetString(ITransportConfiguration config)
 		return Milliseconds.ToString();
 	}
 
-	public bool Equals(Time other)
+	public bool Equals(Duration other)
 	{
 		if (ReferenceEquals(null, other))
 			return false;
@@ -286,7 +286,7 @@ public override bool Equals(object obj)
 		if (obj.GetType() != GetType())
 			return false;
 
-		return Equals((Time)obj);
+		return Equals((Duration)obj);
 	}
 
 	public override int GetHashCode() => StaticTimeValue.HasValue
@@ -392,33 +392,33 @@ private static string ExponentFormat(double d)
 	}
 }
 
-internal sealed class TimeConverter : JsonConverter<Time>
+internal sealed class DurationConverter : JsonConverter<Duration>
 {
-	public override Time? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	public override Duration? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 	{
 		var token = reader.TokenType;
 
 		switch (token)
 		{
 			case JsonTokenType.String:
-				return new Time(reader.GetString());
+				return new Duration(reader.GetString());
 			case JsonTokenType.Number:
 				var milliseconds = reader.GetInt64();
 				if (milliseconds == -1)
-					return Time.MinusOne;
+					return Duration.MinusOne;
 				if (milliseconds == 0)
-					return Time.Zero;
-				return new Time(milliseconds);
+					return Duration.Zero;
+				return new Duration(milliseconds);
 			default:
 				return null;
 		}
 	}
 
-	public override void Write(Utf8JsonWriter writer, Time value, JsonSerializerOptions options)
+	public override void Write(Utf8JsonWriter writer, Duration value, JsonSerializerOptions options)
 	{
-		if (value == Time.MinusOne)
+		if (value == Duration.MinusOne)
 			writer.WriteNumberValue(-1);
-		else if (value == Time.Zero)
+		else if (value == Duration.Zero)
 			writer.WriteNumberValue(0);
 		else if (value.Factor.HasValue && value.Interval.HasValue)
 			writer.WriteStringValue(value.ToString());
diff --git a/src/Elastic.Clients.Elasticsearch/Common/TimeUnit/TimeUnit.cs b/src/Elastic.Clients.Elasticsearch/Common/DateTime/TimeUnit.cs
similarity index 100%
rename from src/Elastic.Clients.Elasticsearch/Common/TimeUnit/TimeUnit.cs
rename to src/Elastic.Clients.Elasticsearch/Common/DateTime/TimeUnit.cs
diff --git a/src/Elastic.Clients.Elasticsearch/Common/DateTimeUtil.cs b/src/Elastic.Clients.Elasticsearch/Common/DateTimeUtil.cs
index 8ec19cb9ede..fe871a83e55 100644
--- a/src/Elastic.Clients.Elasticsearch/Common/DateTimeUtil.cs
+++ b/src/Elastic.Clients.Elasticsearch/Common/DateTimeUtil.cs
@@ -12,46 +12,3 @@ internal static class DateTimeUtil
 {
 	public static readonly DateTimeOffset UnixEpoch = new(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero);
 }
-
-[JsonConverter(typeof(EpochMillisConverter))]
-public readonly struct EpochMillis
-{
-	public static EpochMillis Zero = new(0);
-
-	public EpochMillis() => MillisecondsSinceEpoch = 0;
-
-	public EpochMillis(long millisecondsSinceEpoch) => MillisecondsSinceEpoch = millisecondsSinceEpoch;
-
-	public static EpochMillis Parse(string millisecondsSinceEpoch)
-	{
-		if (!long.TryParse(millisecondsSinceEpoch, out var parsedValue))
-			throw new InvalidOperationException($"Unable to parse value '{millisecondsSinceEpoch}' to epoch milliseconds.");
-				
-		return new EpochMillis(parsedValue);
-	}
-
-	public long MillisecondsSinceEpoch { get; private init; }
-
-	public DateTimeOffset DateTimeOffset => DateTimeUtil.UnixEpoch.AddMilliseconds(MillisecondsSinceEpoch);
-}
-
-internal sealed class EpochMillisConverter : JsonConverter<EpochMillis>
-{
-	public override EpochMillis Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-	{
-		if (reader.TokenType == JsonTokenType.String)
-		{
-			var valueAsString = reader.GetString();
-			return EpochMillis.Parse(valueAsString);
-		}
-		else if (reader.TokenType == JsonTokenType.Number)
-		{
-			var value = reader.GetInt64();
-			return new EpochMillis(value);
-		}
-
-		throw new JsonException("Value could not be parsed to EpochMillis");
-	}
-
-	public override void Write(Utf8JsonWriter writer, EpochMillis value, JsonSerializerOptions options) => writer.WriteNumberValue(value.MillisecondsSinceEpoch);
-}
diff --git a/src/Elastic.Clients.Elasticsearch/Common/UrlParameters/DataStreamNames/DataStreamName.cs b/src/Elastic.Clients.Elasticsearch/Common/UrlParameters/DataStreamNames/DataStreamName.cs
index 78a1b450bf3..7ef2d45eeab 100644
--- a/src/Elastic.Clients.Elasticsearch/Common/UrlParameters/DataStreamNames/DataStreamName.cs
+++ b/src/Elastic.Clients.Elasticsearch/Common/UrlParameters/DataStreamNames/DataStreamName.cs
@@ -14,7 +14,7 @@ namespace Elastic.Clients.Elasticsearch
 	[DebuggerDisplay("{DebugDisplay,nq}")]
 	public sealed class DataStreamName : IEquatable<DataStreamName>, IUrlParameter
 	{
-		internal DataStreamName(string index) => Name = index;
+		internal DataStreamName(string dataStreamName) => Name = dataStreamName;
 
 		public string Name { get; }
 
diff --git a/src/Elastic.Clients.Elasticsearch/Common/UrlParameters/ScrollIds/ScrollId.cs b/src/Elastic.Clients.Elasticsearch/Common/UrlParameters/ScrollIds/ScrollId.cs
new file mode 100644
index 00000000000..e006413bc36
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/Common/UrlParameters/ScrollIds/ScrollId.cs
@@ -0,0 +1,79 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Elastic.Transport;
+
+namespace Elastic.Clients.Elasticsearch
+{
+	[JsonConverter(typeof(ScrollIdConverter))]
+	[DebuggerDisplay("{DebugDisplay,nq}")]
+	public sealed class ScrollId : IEquatable<ScrollId>, IUrlParameter
+	{
+		internal ScrollId(string scrollId) => Id = scrollId;
+
+		public string Id { get; }
+
+		internal string DebugDisplay => Id;
+
+		public static implicit operator ScrollId(string scrollId) => new(scrollId);
+
+		public static bool operator ==(ScrollId left, ScrollId right) => Equals(left, right);
+
+		public static bool operator !=(ScrollId left, ScrollId right) => !Equals(left, right);
+
+		bool IEquatable<ScrollId>.Equals(ScrollId other) => EqualsMarker(other);
+
+		private bool EqualsString(string other) => !other.IsNullOrEmpty() && other.Equals(Id, StringComparison.Ordinal);
+
+		public override bool Equals(object obj) => obj is string s ? EqualsString(s) : obj is ScrollId i && EqualsMarker(i);
+
+		string IUrlParameter.GetString(ITransportConfiguration? settings) => Id;
+
+		public override string ToString() => Id ?? string.Empty;
+
+		private bool EqualsMarker(ScrollId other)
+		{
+			if (other == null)
+				return false;
+
+			return EqualsString(other.Id);
+		}
+
+		private static int TypeHashCode { get; } = typeof(ScrollId).GetHashCode();
+
+		public override int GetHashCode()
+		{
+			unchecked
+			{
+				return (TypeHashCode * 23) ^ (Id.GetHashCode());
+			}
+		}
+	}
+
+	internal sealed class ScrollIdConverter : JsonConverter<ScrollId>
+	{
+		public override ScrollId? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+		{
+			if (reader.TokenType != JsonTokenType.String)
+				throw new JsonException($"Unexpected token '{reader.TokenType}' for DataStreamName");
+
+			return reader.GetString();
+		}
+
+		public override void Write(Utf8JsonWriter writer, ScrollId value, JsonSerializerOptions options)
+		{
+			if (value is null || value.Id is null)
+			{
+				writer.WriteNullValue();
+				return;
+			}
+
+			writer.WriteStringValue(value.Id);
+		}
+	}
+}
diff --git a/src/Elastic.Clients.Elasticsearch/Common/UrlParameters/ScrollIds/ScrollIds.cs b/src/Elastic.Clients.Elasticsearch/Common/UrlParameters/ScrollIds/ScrollIds.cs
new file mode 100644
index 00000000000..4021d7a8aa5
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/Common/UrlParameters/ScrollIds/ScrollIds.cs
@@ -0,0 +1,121 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Elastic.Transport;
+
+namespace Elastic.Clients.Elasticsearch
+{
+	[JsonConverter(typeof(ScrollIdsConverter))]
+	[DebuggerDisplay("{DebugDisplay,nq}")]
+	public sealed class ScrollIds : IUrlParameter, IEnumerable<ScrollId>, IEquatable<ScrollIds>
+	{
+		internal readonly IList<ScrollId> Ids;
+
+		internal ScrollIds() => Ids = new List<ScrollId>();
+
+		internal ScrollIds(IEnumerable<ScrollId> dataStreamNames) => Ids = dataStreamNames.ToList();
+
+		internal ScrollIds(IList<ScrollId> dataStreamNames) => Ids = dataStreamNames;
+
+		private string DebugDisplay =>
+			$"Count: {Ids.Count} [" + string.Join(",", Ids.Select((t, i) => $"({i + 1}: {t?.DebugDisplay ?? "NULL"})")) + "]";
+
+		public override string ToString() => string.Join(",", Ids.Where(f => f is not null).Select(f => f.Id));
+
+		public static implicit operator ScrollIds(string[] scrollIds) => scrollIds.IsEmpty() ? null : new ScrollIds(scrollIds.Select(f => new ScrollId(f)));
+
+		public static implicit operator ScrollIds(string scrollIds) => scrollIds.IsNullOrEmptyCommaSeparatedList(out var split)
+			? null
+			: new ScrollIds(split.Select(f => new ScrollId(f)));
+
+		public static implicit operator ScrollIds(ScrollId scrollId) => scrollId == null ? null : new ScrollIds(new[] { scrollId });
+
+		public static implicit operator ScrollIds(ScrollId[] scrollIds) => scrollIds.IsEmpty() ? null : new ScrollIds(scrollIds);
+
+		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+		public IEnumerator<ScrollId> GetEnumerator() => Ids.GetEnumerator();
+
+		public static bool operator ==(ScrollIds left, ScrollIds right) => Equals(left, right);
+
+		public static bool operator !=(ScrollIds left, ScrollIds right) => !Equals(left, right);
+
+		public override bool Equals(object obj) =>
+			obj switch
+			{
+				ScrollIds f => Equals(f),
+				string s => Equals(s),
+				ScrollIds[] fns => Equals(fns),
+				_ => false,
+			};
+
+		public bool Equals(ScrollIds other) => EqualsAllIds(Ids, other.Ids);
+
+		private static bool EqualsAllIds(IList<ScrollId> thisTypes, IList<ScrollId> otherTypes)
+		{
+			if (thisTypes is null && otherTypes is null)
+				return true;
+
+			if (thisTypes is null || otherTypes is null)
+				return false;
+
+			if (thisTypes.Count != otherTypes.Count)
+				return false;
+
+			return !thisTypes.Except(otherTypes).Any();
+		}
+
+		public override int GetHashCode()
+		{
+			var hashCodes = new List<int>(Ids.Count);
+			foreach (var item in Ids)
+			{
+				hashCodes.Add(item.GetHashCode());
+			}
+
+			hashCodes.Sort();
+
+			unchecked
+			{
+				var hash = 17;
+				foreach (var hashCode in hashCodes)
+				{
+					hash = hash * 23 + hashCode;
+				}
+				return typeof(ScrollId).GetHashCode() ^ hash;
+			}
+		}
+
+		string IUrlParameter.GetString(ITransportConfiguration? settings) => ToString();
+	}
+
+	internal sealed class ScrollIdsConverter : JsonConverter<ScrollIds>
+	{
+		public override ScrollIds? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+		{
+			if (reader.TokenType != JsonTokenType.StartArray)
+				throw new JsonException($"Expected {JsonTokenType.StartArray} token but read '{reader.TokenType}' token for ScrollIds.");
+
+			return JsonSerializer.Deserialize<string[]>(ref reader, options);
+		}
+
+		public override void Write(Utf8JsonWriter writer, ScrollIds value, JsonSerializerOptions options)
+		{
+			if (value is null)
+			{
+				writer.WriteNullValue();
+				return;
+			}
+
+			JsonSerializer.Serialize(writer, value.Ids, options);
+		}
+	}
+}
diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllRequest.cs b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllRequest.cs
index 327fc2bf463..94de66e5c94 100644
--- a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllRequest.cs
+++ b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllRequest.cs
@@ -23,7 +23,7 @@ public BulkAllRequest(IEnumerable<T> documents)
 
 	public int? BackOffRetries { get; set; }
 
-	public Time? BackOffTime { get; set; }
+	public Duration? BackOffTime { get; set; }
 
 	public ProducerConsumerBackPressure? BackPressure { get; set; }
 
@@ -41,7 +41,7 @@ public BulkAllRequest(IEnumerable<T> documents)
 
 	public int? MaxDegreeOfParallelism { get; set; }
 
-	public Time? Timeout { get; set; }
+	public Duration? Timeout { get; set; }
 
 	public string? Pipeline { get; set; }
 
@@ -63,7 +63,7 @@ public sealed class BulkAllRequestDescriptor<T> : SerializableDescriptorBase<Bul
 	private readonly IEnumerable<T> _documents;
 
 	private int? _backOffRetries;
-	private Time _backOffTime;
+	private Duration _backOffTime;
 	private ProducerConsumerBackPressure _backPressure;
 	private Action<BulkResponse> _bulkResponseCallback;
 	private IndexName _index;
@@ -77,7 +77,7 @@ public sealed class BulkAllRequestDescriptor<T> : SerializableDescriptorBase<Bul
 	private bool _continueAfterDroppedDocuments;
 	private string _pipeline;
 	private Indices _refreshIndices;
-	private Time _timeout;
+	private Duration _timeout;
 	private WaitForActiveShards? _waitForActiveShards;
 	private RequestMetaData _requestMetaData;
 
@@ -88,7 +88,7 @@ public BulkAllRequestDescriptor(IEnumerable<T> documents)
 	}
 
 	int? IBulkAllRequest<T>.BackOffRetries => _backOffRetries;
-	Time? IBulkAllRequest<T>.BackOffTime => _backOffTime;
+	Duration? IBulkAllRequest<T>.BackOffTime => _backOffTime;
 	ProducerConsumerBackPressure? IBulkAllRequest<T>.BackPressure => _backPressure;
 	Action<BulkRequestDescriptor, IList<T>>? IBulkAllRequest<T>.BufferToBulk => _bufferToBulk;
 	Action<BulkResponse>? IBulkAllRequest<T>.BulkResponseCallback => _bulkResponseCallback;
@@ -103,13 +103,13 @@ public BulkAllRequestDescriptor(IEnumerable<T> documents)
 	Func<BulkResponseItemBase, T, bool>? IBulkAllRequest<T>.RetryDocumentPredicate => _retryDocumentPredicate;
 	Routing? IBulkAllRequest<T>.Routing => _routing;
 	int? IBulkAllRequest<T>.Size => _size;
-	Time? IBulkAllRequest<T>.Timeout => _timeout;
+	Duration? IBulkAllRequest<T>.Timeout => _timeout;
 	WaitForActiveShards? IBulkAllRequest<T>.WaitForActiveShards => _waitForActiveShards;
 	RequestMetaData IHelperCallable.ParentMetaData { get => _requestMetaData; set => _requestMetaData = value; }
 
 	public BulkAllRequestDescriptor<T> BackOffRetries(int? backOffRetries) => Assign(backOffRetries, (a, v) => a._backOffRetries = v);
 
-	public BulkAllRequestDescriptor<T> BackOffTime(Time? backOffTime) => Assign(backOffTime, (a, v) => a._backOffTime = v);
+	public BulkAllRequestDescriptor<T> BackOffTime(Duration? backOffTime) => Assign(backOffTime, (a, v) => a._backOffTime = v);
 
 	public BulkAllRequestDescriptor<T> BackPressure(int maxConcurrency, int? backPressureFactor = null) =>
 			Assign(new ProducerConsumerBackPressure(backPressureFactor, maxConcurrency), (a, v) => a._backPressure = v);
@@ -143,7 +143,7 @@ public BulkAllRequestDescriptor<T> RetryDocumentPredicate(Func<BulkResponseItemB
 
 	public BulkAllRequestDescriptor<T> Size(int? size) => Assign(size, (a, v) => a._size = v);
 
-	public BulkAllRequestDescriptor<T> Timeout(Time timeout) => Assign(timeout, (a, v) => a._timeout = v);
+	public BulkAllRequestDescriptor<T> Timeout(Duration timeout) => Assign(timeout, (a, v) => a._timeout = v);
 
 	public BulkAllRequestDescriptor<T> WaitForActiveShards(WaitForActiveShards? shards) => Assign(shards, (a, v) => a._waitForActiveShards = v);
 
diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/IBulkAllRequest.cs b/src/Elastic.Clients.Elasticsearch/Helpers/IBulkAllRequest.cs
index bca56b329b3..fd647b793e8 100644
--- a/src/Elastic.Clients.Elasticsearch/Helpers/IBulkAllRequest.cs
+++ b/src/Elastic.Clients.Elasticsearch/Helpers/IBulkAllRequest.cs
@@ -10,7 +10,7 @@ namespace Elastic.Clients.Elasticsearch
 	public interface IBulkAllRequest<T>
 	{
 		int? BackOffRetries { get; }
-		Time? BackOffTime { get; }
+		Duration? BackOffTime { get; }
 		ProducerConsumerBackPressure? BackPressure { get; }
 		Action<BulkRequestDescriptor, IList<T>>? BufferToBulk { get; }
 		Action<BulkResponse>? BulkResponseCallback { get; }
@@ -25,7 +25,7 @@ public interface IBulkAllRequest<T>
 		Func<BulkResponseItemBase, T, bool>? RetryDocumentPredicate { get; }
 		Routing? Routing { get; }
 		int? Size { get; }
-		Time? Timeout { get; }
+		Duration? Timeout { get; }
 		WaitForActiveShards? WaitForActiveShards { get; }
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/Stringified.cs b/src/Elastic.Clients.Elasticsearch/Serialization/Stringified.cs
new file mode 100644
index 00000000000..9e13b8d8d69
--- /dev/null
+++ b/src/Elastic.Clients.Elasticsearch/Serialization/Stringified.cs
@@ -0,0 +1,32 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Elastic.Clients.Elasticsearch;
+
+internal sealed class StringifiedLongConverter : JsonConverter<long?>
+{
+	public override long? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		if (reader.TokenType == JsonTokenType.String)
+		{
+			var longString = reader.GetString();
+
+			if (!long.TryParse(longString, out var longValue))
+			{
+				throw new JsonException("Unable to parse string value to long.");
+			}
+
+			return longValue;
+		}
+
+		return reader.GetInt64();
+	}
+
+
+	public override void Write(Utf8JsonWriter writer, long? value, JsonSerializerOptions options) => writer.WriteNumberValue(value.Value);
+}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs
index 85452b963a7..1609c9aec0f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs
@@ -16,6 +16,7 @@
 // ------------------------------------------------
 
 using Elastic.Transport.Products.Elasticsearch;
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -28,9 +29,13 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponseBas
 		[JsonPropertyName("completion_status")]
 		public int? CompletionStatus { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("expiration_time")]
+		public DateTimeOffset? ExpirationTime { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("expiration_time_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis ExpirationTimeInMillis { get; init; }
+		public long ExpirationTimeInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("id")]
@@ -48,8 +53,12 @@ public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponseBas
 		[JsonPropertyName("_shards")]
 		public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("start_time")]
+		public DateTimeOffset? StartTime { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("start_time_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis StartTimeInMillis { get; init; }
+		public long StartTimeInMillis { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs
index 1daf53fcf35..a738aadfdda 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs
@@ -28,13 +28,13 @@ namespace Elastic.Clients.Elasticsearch.AsyncSearch
 	public sealed class AsyncSearchSubmitRequestParameters : RequestParameters<AsyncSearchSubmitRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 
 		[JsonIgnore]
 		public bool? KeepOnCompletion { get => Q<bool?>("keep_on_completion"); set => Q("keep_on_completion", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Time?>("keep_alive"); set => Q("keep_alive", value); }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
 		[JsonIgnore]
 		public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
@@ -91,7 +91,7 @@ public sealed class AsyncSearchSubmitRequestParameters : RequestParameters<Async
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Scroll { get => Q<Elastic.Clients.Elasticsearch.Time?>("scroll"); set => Q("scroll", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
@@ -138,13 +138,13 @@ public AsyncSearchSubmitRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 
 		[JsonIgnore]
 		public bool? KeepOnCompletion { get => Q<bool?>("keep_on_completion"); set => Q("keep_on_completion", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Time?>("keep_alive"); set => Q("keep_alive", value); }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
 		[JsonIgnore]
 		public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
@@ -201,7 +201,7 @@ public AsyncSearchSubmitRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Scroll { get => Q<Elastic.Clients.Elasticsearch.Time?>("scroll"); set => Q("scroll", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
@@ -384,7 +384,7 @@ public AsyncSearchSubmitRequestDescriptor()
 		public AsyncSearchSubmitRequestDescriptor<TDocument> ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> IgnoreThrottled(bool? ignoreThrottled = true) => Qs("ignore_throttled", ignoreThrottled);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public AsyncSearchSubmitRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive) => Qs("keep_alive", keepAlive);
+		public AsyncSearchSubmitRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> KeepOnCompletion(bool? keepOnCompletion = true) => Qs("keep_on_completion", keepOnCompletion);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> Lenient(bool? lenient = true) => Qs("lenient", lenient);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> MaxConcurrentShardRequests(long? maxConcurrentShardRequests) => Qs("max_concurrent_shard_requests", maxConcurrentShardRequests);
@@ -395,14 +395,14 @@ public AsyncSearchSubmitRequestDescriptor()
 		public AsyncSearchSubmitRequestDescriptor<TDocument> RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public AsyncSearchSubmitRequestDescriptor<TDocument> Scroll(Elastic.Clients.Elasticsearch.Time? scroll) => Qs("scroll", scroll);
+		public AsyncSearchSubmitRequestDescriptor<TDocument> Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> SuggestField(Elastic.Clients.Elasticsearch.Field? suggestField) => Qs("suggest_field", suggestField);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> SuggestMode(Elastic.Clients.Elasticsearch.SuggestMode? suggestMode) => Qs("suggest_mode", suggestMode);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> SuggestSize(long? suggestSize) => Qs("suggest_size", suggestSize);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> SuggestText(string? suggestText) => Qs("suggest_text", suggestText);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
-		public AsyncSearchSubmitRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+		public AsyncSearchSubmitRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
 		public AsyncSearchSubmitRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 		{
 			RouteValues.Optional("index", indices);
@@ -1324,7 +1324,7 @@ public AsyncSearchSubmitRequestDescriptor()
 		public AsyncSearchSubmitRequestDescriptor ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public AsyncSearchSubmitRequestDescriptor IgnoreThrottled(bool? ignoreThrottled = true) => Qs("ignore_throttled", ignoreThrottled);
 		public AsyncSearchSubmitRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public AsyncSearchSubmitRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive) => Qs("keep_alive", keepAlive);
+		public AsyncSearchSubmitRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
 		public AsyncSearchSubmitRequestDescriptor KeepOnCompletion(bool? keepOnCompletion = true) => Qs("keep_on_completion", keepOnCompletion);
 		public AsyncSearchSubmitRequestDescriptor Lenient(bool? lenient = true) => Qs("lenient", lenient);
 		public AsyncSearchSubmitRequestDescriptor MaxConcurrentShardRequests(long? maxConcurrentShardRequests) => Qs("max_concurrent_shard_requests", maxConcurrentShardRequests);
@@ -1335,14 +1335,14 @@ public AsyncSearchSubmitRequestDescriptor()
 		public AsyncSearchSubmitRequestDescriptor RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache);
 		public AsyncSearchSubmitRequestDescriptor RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt);
 		public AsyncSearchSubmitRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public AsyncSearchSubmitRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Time? scroll) => Qs("scroll", scroll);
+		public AsyncSearchSubmitRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll);
 		public AsyncSearchSubmitRequestDescriptor SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 		public AsyncSearchSubmitRequestDescriptor SuggestField(Elastic.Clients.Elasticsearch.Field? suggestField) => Qs("suggest_field", suggestField);
 		public AsyncSearchSubmitRequestDescriptor SuggestMode(Elastic.Clients.Elasticsearch.SuggestMode? suggestMode) => Qs("suggest_mode", suggestMode);
 		public AsyncSearchSubmitRequestDescriptor SuggestSize(long? suggestSize) => Qs("suggest_size", suggestSize);
 		public AsyncSearchSubmitRequestDescriptor SuggestText(string? suggestText) => Qs("suggest_text", suggestText);
 		public AsyncSearchSubmitRequestDescriptor TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
-		public AsyncSearchSubmitRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+		public AsyncSearchSubmitRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
 		public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 		{
 			RouteValues.Optional("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitResponse.g.cs
index 9b0853b8d7f..e7b6cc5dbfa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitResponse.g.cs
@@ -16,6 +16,7 @@
 // ------------------------------------------------
 
 using Elastic.Transport.Products.Elasticsearch;
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -24,9 +25,13 @@ namespace Elastic.Clients.Elasticsearch.AsyncSearch
 {
 	public sealed partial class AsyncSearchSubmitResponse<TDocument> : ElasticsearchResponseBase
 	{
+		[JsonInclude]
+		[JsonPropertyName("expiration_time")]
+		public DateTimeOffset? ExpirationTime { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("expiration_time_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis ExpirationTimeInMillis { get; init; }
+		public long ExpirationTimeInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("id")]
@@ -44,8 +49,12 @@ public sealed partial class AsyncSearchSubmitResponse<TDocument> : Elasticsearch
 		[JsonPropertyName("response")]
 		public Elastic.Clients.Elasticsearch.AsyncSearch.AsyncSearch<TDocument> Response { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("start_time")]
+		public DateTimeOffset? StartTime { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("start_time_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis StartTimeInMillis { get; init; }
+		public long StartTimeInMillis { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchRequest.g.cs
index fea78308d7c..1b0df1799ca 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchRequest.g.cs
@@ -28,13 +28,13 @@ namespace Elastic.Clients.Elasticsearch.AsyncSearch
 	public sealed class GetAsyncSearchRequestParameters : RequestParameters<GetAsyncSearchRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Time?>("keep_alive"); set => Q("keep_alive", value); }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
 		[JsonIgnore]
 		public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 	}
 
 	public partial class GetAsyncSearchRequest : PlainRequestBase<GetAsyncSearchRequestParameters>
@@ -47,13 +47,13 @@ public GetAsyncSearchRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Time?>("keep_alive"); set => Q("keep_alive", value); }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
 		[JsonIgnore]
 		public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 	}
 
 	public sealed partial class GetAsyncSearchRequestDescriptor<TDocument> : RequestDescriptorBase<GetAsyncSearchRequestDescriptor<TDocument>, GetAsyncSearchRequestParameters>
@@ -70,9 +70,9 @@ internal GetAsyncSearchRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchGet;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public GetAsyncSearchRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive) => Qs("keep_alive", keepAlive);
+		public GetAsyncSearchRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
 		public GetAsyncSearchRequestDescriptor<TDocument> TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
-		public GetAsyncSearchRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+		public GetAsyncSearchRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
 		public GetAsyncSearchRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
@@ -98,9 +98,9 @@ internal GetAsyncSearchRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchGet;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public GetAsyncSearchRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive) => Qs("keep_alive", keepAlive);
+		public GetAsyncSearchRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
 		public GetAsyncSearchRequestDescriptor TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
-		public GetAsyncSearchRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+		public GetAsyncSearchRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
 		public GetAsyncSearchRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs
index 83ac59d78e9..7d171b84e6b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs
@@ -16,6 +16,7 @@
 // ------------------------------------------------
 
 using Elastic.Transport.Products.Elasticsearch;
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -24,9 +25,13 @@ namespace Elastic.Clients.Elasticsearch.AsyncSearch
 {
 	public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchResponseBase
 	{
+		[JsonInclude]
+		[JsonPropertyName("expiration_time")]
+		public DateTimeOffset? ExpirationTime { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("expiration_time_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis ExpirationTimeInMillis { get; init; }
+		public long ExpirationTimeInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("id")]
@@ -44,8 +49,12 @@ public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchRes
 		[JsonPropertyName("response")]
 		public Elastic.Clients.Elasticsearch.AsyncSearch.AsyncSearch<TDocument> Response { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("start_time")]
+		public DateTimeOffset? StartTime { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("start_time_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis StartTimeInMillis { get; init; }
+		public long StartTimeInMillis { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkRequest.g.cs
index fa824f9a684..927620914e0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkRequest.g.cs
@@ -46,7 +46,7 @@ public sealed class BulkRequestParameters : RequestParameters<BulkRequestParamet
 		public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -87,7 +87,7 @@ public BulkRequest(Elastic.Clients.Elasticsearch.IndexName? index) : base(r => r
 		public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -113,7 +113,7 @@ public BulkRequestDescriptor()
 		public BulkRequestDescriptor<TDocument> Refresh(Elastic.Clients.Elasticsearch.Refresh? refresh) => Qs("refresh", refresh);
 		public BulkRequestDescriptor<TDocument> RequireAlias(bool? requireAlias = true) => Qs("require_alias", requireAlias);
 		public BulkRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public BulkRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public BulkRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public BulkRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public BulkRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName? index)
 		{
@@ -143,7 +143,7 @@ public BulkRequestDescriptor()
 		public BulkRequestDescriptor Refresh(Elastic.Clients.Elasticsearch.Refresh? refresh) => Qs("refresh", refresh);
 		public BulkRequestDescriptor RequireAlias(bool? requireAlias = true) => Qs("require_alias", requireAlias);
 		public BulkRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public BulkRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public BulkRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public BulkRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public BulkRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName? index)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrFollowRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrFollowRequest.g.cs
index 9b6c45e9693..619cbd33d71 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrFollowRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrFollowRequest.g.cs
@@ -65,7 +65,7 @@ public CcrFollowRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r
 
 		[JsonInclude]
 		[JsonPropertyName("max_retry_delay")]
-		public Elastic.Clients.Elasticsearch.Time? MaxRetryDelay { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? MaxRetryDelay { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("max_write_buffer_count")]
@@ -85,7 +85,7 @@ public CcrFollowRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r
 
 		[JsonInclude]
 		[JsonPropertyName("read_poll_timeout")]
-		public Elastic.Clients.Elasticsearch.Time? ReadPollTimeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? ReadPollTimeout { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("remote_cluster")]
@@ -127,7 +127,7 @@ public CcrFollowRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch
 
 		private string? MaxReadRequestSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? MaxRetryDelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? MaxRetryDelayValue { get; set; }
 
 		private long? MaxWriteBufferCountValue { get; set; }
 
@@ -137,7 +137,7 @@ public CcrFollowRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch
 
 		private string? MaxWriteRequestSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? ReadPollTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? ReadPollTimeoutValue { get; set; }
 
 		private string? RemoteClusterValue { get; set; }
 
@@ -171,7 +171,7 @@ public CcrFollowRequestDescriptor<TDocument> MaxReadRequestSize(string? maxReadR
 			return Self;
 		}
 
-		public CcrFollowRequestDescriptor<TDocument> MaxRetryDelay(Elastic.Clients.Elasticsearch.Time? maxRetryDelay)
+		public CcrFollowRequestDescriptor<TDocument> MaxRetryDelay(Elastic.Clients.Elasticsearch.Duration? maxRetryDelay)
 		{
 			MaxRetryDelayValue = maxRetryDelay;
 			return Self;
@@ -201,7 +201,7 @@ public CcrFollowRequestDescriptor<TDocument> MaxWriteRequestSize(string? maxWrit
 			return Self;
 		}
 
-		public CcrFollowRequestDescriptor<TDocument> ReadPollTimeout(Elastic.Clients.Elasticsearch.Time? readPollTimeout)
+		public CcrFollowRequestDescriptor<TDocument> ReadPollTimeout(Elastic.Clients.Elasticsearch.Duration? readPollTimeout)
 		{
 			ReadPollTimeoutValue = readPollTimeout;
 			return Self;
@@ -323,7 +323,7 @@ public CcrFollowRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName
 
 		private string? MaxReadRequestSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? MaxRetryDelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? MaxRetryDelayValue { get; set; }
 
 		private long? MaxWriteBufferCountValue { get; set; }
 
@@ -333,7 +333,7 @@ public CcrFollowRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName
 
 		private string? MaxWriteRequestSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? ReadPollTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? ReadPollTimeoutValue { get; set; }
 
 		private string? RemoteClusterValue { get; set; }
 
@@ -367,7 +367,7 @@ public CcrFollowRequestDescriptor MaxReadRequestSize(string? maxReadRequestSize)
 			return Self;
 		}
 
-		public CcrFollowRequestDescriptor MaxRetryDelay(Elastic.Clients.Elasticsearch.Time? maxRetryDelay)
+		public CcrFollowRequestDescriptor MaxRetryDelay(Elastic.Clients.Elasticsearch.Duration? maxRetryDelay)
 		{
 			MaxRetryDelayValue = maxRetryDelay;
 			return Self;
@@ -397,7 +397,7 @@ public CcrFollowRequestDescriptor MaxWriteRequestSize(string? maxWriteRequestSiz
 			return Self;
 		}
 
-		public CcrFollowRequestDescriptor ReadPollTimeout(Elastic.Clients.Elasticsearch.Time? readPollTimeout)
+		public CcrFollowRequestDescriptor ReadPollTimeout(Elastic.Clients.Elasticsearch.Duration? readPollTimeout)
 		{
 			ReadPollTimeoutValue = readPollTimeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrPutAutoFollowPatternRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrPutAutoFollowPatternRequest.g.cs
index add367318d7..d839dc48a0d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrPutAutoFollowPatternRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrPutAutoFollowPatternRequest.g.cs
@@ -68,7 +68,7 @@ public CcrPutAutoFollowPatternRequest(Elastic.Clients.Elasticsearch.Name name) :
 
 		[JsonInclude]
 		[JsonPropertyName("read_poll_timeout")]
-		public Elastic.Clients.Elasticsearch.Time? ReadPollTimeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? ReadPollTimeout { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("max_read_request_operation_count")]
@@ -80,7 +80,7 @@ public CcrPutAutoFollowPatternRequest(Elastic.Clients.Elasticsearch.Name name) :
 
 		[JsonInclude]
 		[JsonPropertyName("max_retry_delay")]
-		public Elastic.Clients.Elasticsearch.Time? MaxRetryDelay { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? MaxRetryDelay { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("max_write_buffer_count")]
@@ -133,7 +133,7 @@ public CcrPutAutoFollowPatternRequestDescriptor Name(Elastic.Clients.Elasticsear
 
 		private Elastic.Clients.Elasticsearch.ByteSize? MaxReadRequestSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? MaxRetryDelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? MaxRetryDelayValue { get; set; }
 
 		private int? MaxWriteBufferCountValue { get; set; }
 
@@ -143,7 +143,7 @@ public CcrPutAutoFollowPatternRequestDescriptor Name(Elastic.Clients.Elasticsear
 
 		private Elastic.Clients.Elasticsearch.ByteSize? MaxWriteRequestSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? ReadPollTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? ReadPollTimeoutValue { get; set; }
 
 		private string RemoteClusterValue { get; set; }
 
@@ -191,7 +191,7 @@ public CcrPutAutoFollowPatternRequestDescriptor MaxReadRequestSize(Elastic.Clien
 			return Self;
 		}
 
-		public CcrPutAutoFollowPatternRequestDescriptor MaxRetryDelay(Elastic.Clients.Elasticsearch.Time? maxRetryDelay)
+		public CcrPutAutoFollowPatternRequestDescriptor MaxRetryDelay(Elastic.Clients.Elasticsearch.Duration? maxRetryDelay)
 		{
 			MaxRetryDelayValue = maxRetryDelay;
 			return Self;
@@ -221,7 +221,7 @@ public CcrPutAutoFollowPatternRequestDescriptor MaxWriteRequestSize(Elastic.Clie
 			return Self;
 		}
 
-		public CcrPutAutoFollowPatternRequestDescriptor ReadPollTimeout(Elastic.Clients.Elasticsearch.Time? readPollTimeout)
+		public CcrPutAutoFollowPatternRequestDescriptor ReadPollTimeout(Elastic.Clients.Elasticsearch.Duration? readPollTimeout)
 		{
 			ReadPollTimeoutValue = readPollTimeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrResumeFollowRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrResumeFollowRequest.g.cs
index c117a58029d..0e3b24e0b3b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrResumeFollowRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ccr/CcrResumeFollowRequest.g.cs
@@ -56,7 +56,7 @@ public CcrResumeFollowRequest(Elastic.Clients.Elasticsearch.IndexName index) : b
 
 		[JsonInclude]
 		[JsonPropertyName("max_retry_delay")]
-		public Elastic.Clients.Elasticsearch.Time? MaxRetryDelay { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? MaxRetryDelay { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("max_write_buffer_count")]
@@ -76,7 +76,7 @@ public CcrResumeFollowRequest(Elastic.Clients.Elasticsearch.IndexName index) : b
 
 		[JsonInclude]
 		[JsonPropertyName("read_poll_timeout")]
-		public Elastic.Clients.Elasticsearch.Time? ReadPollTimeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? ReadPollTimeout { get; set; }
 	}
 
 	public sealed partial class CcrResumeFollowRequestDescriptor<TDocument> : RequestDescriptorBase<CcrResumeFollowRequestDescriptor<TDocument>, CcrResumeFollowRequestParameters>
@@ -111,7 +111,7 @@ public CcrResumeFollowRequestDescriptor<TDocument> Index(Elastic.Clients.Elastic
 
 		private string? MaxReadRequestSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? MaxRetryDelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? MaxRetryDelayValue { get; set; }
 
 		private long? MaxWriteBufferCountValue { get; set; }
 
@@ -121,7 +121,7 @@ public CcrResumeFollowRequestDescriptor<TDocument> Index(Elastic.Clients.Elastic
 
 		private string? MaxWriteRequestSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? ReadPollTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? ReadPollTimeoutValue { get; set; }
 
 		public CcrResumeFollowRequestDescriptor<TDocument> MaxOutstandingReadRequests(long? maxOutstandingReadRequests)
 		{
@@ -147,7 +147,7 @@ public CcrResumeFollowRequestDescriptor<TDocument> MaxReadRequestSize(string? ma
 			return Self;
 		}
 
-		public CcrResumeFollowRequestDescriptor<TDocument> MaxRetryDelay(Elastic.Clients.Elasticsearch.Time? maxRetryDelay)
+		public CcrResumeFollowRequestDescriptor<TDocument> MaxRetryDelay(Elastic.Clients.Elasticsearch.Duration? maxRetryDelay)
 		{
 			MaxRetryDelayValue = maxRetryDelay;
 			return Self;
@@ -177,7 +177,7 @@ public CcrResumeFollowRequestDescriptor<TDocument> MaxWriteRequestSize(string? m
 			return Self;
 		}
 
-		public CcrResumeFollowRequestDescriptor<TDocument> ReadPollTimeout(Elastic.Clients.Elasticsearch.Time? readPollTimeout)
+		public CcrResumeFollowRequestDescriptor<TDocument> ReadPollTimeout(Elastic.Clients.Elasticsearch.Duration? readPollTimeout)
 		{
 			ReadPollTimeoutValue = readPollTimeout;
 			return Self;
@@ -278,7 +278,7 @@ public CcrResumeFollowRequestDescriptor Index(Elastic.Clients.Elasticsearch.Inde
 
 		private string? MaxReadRequestSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? MaxRetryDelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? MaxRetryDelayValue { get; set; }
 
 		private long? MaxWriteBufferCountValue { get; set; }
 
@@ -288,7 +288,7 @@ public CcrResumeFollowRequestDescriptor Index(Elastic.Clients.Elasticsearch.Inde
 
 		private string? MaxWriteRequestSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? ReadPollTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? ReadPollTimeoutValue { get; set; }
 
 		public CcrResumeFollowRequestDescriptor MaxOutstandingReadRequests(long? maxOutstandingReadRequests)
 		{
@@ -314,7 +314,7 @@ public CcrResumeFollowRequestDescriptor MaxReadRequestSize(string? maxReadReques
 			return Self;
 		}
 
-		public CcrResumeFollowRequestDescriptor MaxRetryDelay(Elastic.Clients.Elasticsearch.Time? maxRetryDelay)
+		public CcrResumeFollowRequestDescriptor MaxRetryDelay(Elastic.Clients.Elasticsearch.Duration? maxRetryDelay)
 		{
 			MaxRetryDelayValue = maxRetryDelay;
 			return Self;
@@ -344,7 +344,7 @@ public CcrResumeFollowRequestDescriptor MaxWriteRequestSize(string? maxWriteRequ
 			return Self;
 		}
 
-		public CcrResumeFollowRequestDescriptor ReadPollTimeout(Elastic.Clients.Elasticsearch.Time? readPollTimeout)
+		public CcrResumeFollowRequestDescriptor ReadPollTimeout(Elastic.Clients.Elasticsearch.Duration? readPollTimeout)
 		{
 			ReadPollTimeoutValue = readPollTimeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterAllocationExplainResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterAllocationExplainResponse.g.cs
index 3317f1359b0..09b58613c1f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterAllocationExplainResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterAllocationExplainResponse.g.cs
@@ -30,7 +30,7 @@ public sealed partial class ClusterAllocationExplainResponse : ElasticsearchResp
 
 		[JsonInclude]
 		[JsonPropertyName("allocation_delay")]
-		public string? AllocationDelay { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? AllocationDelay { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("allocation_delay_in_millis")]
@@ -70,7 +70,7 @@ public sealed partial class ClusterAllocationExplainResponse : ElasticsearchResp
 
 		[JsonInclude]
 		[JsonPropertyName("configured_delay")]
-		public string? ConfiguredDelay { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? ConfiguredDelay { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("configured_delay_in_millis")]
@@ -110,7 +110,7 @@ public sealed partial class ClusterAllocationExplainResponse : ElasticsearchResp
 
 		[JsonInclude]
 		[JsonPropertyName("remaining_delay")]
-		public string? RemainingDelay { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? RemainingDelay { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("remaining_delay_in_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterDeleteComponentTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterDeleteComponentTemplateRequest.g.cs
index 4a6bb30a907..fb984eb47dd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterDeleteComponentTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterDeleteComponentTemplateRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Cluster
 	public sealed class ClusterDeleteComponentTemplateRequestParameters : RequestParameters<ClusterDeleteComponentTemplateRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class ClusterDeleteComponentTemplateRequest : PlainRequestBase<ClusterDeleteComponentTemplateRequestParameters>
@@ -44,10 +44,10 @@ public ClusterDeleteComponentTemplateRequest(Elastic.Clients.Elasticsearch.Names
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class ClusterDeleteComponentTemplateRequestDescriptor : RequestDescriptorBase<ClusterDeleteComponentTemplateRequestDescriptor, ClusterDeleteComponentTemplateRequestParameters>
@@ -64,8 +64,8 @@ internal ClusterDeleteComponentTemplateRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.ClusterDeleteComponentTemplate;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public ClusterDeleteComponentTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public ClusterDeleteComponentTemplateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ClusterDeleteComponentTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterDeleteComponentTemplateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public ClusterDeleteComponentTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names name)
 		{
 			RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterExistsComponentTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterExistsComponentTemplateRequest.g.cs
index 173e6902838..bb1b20d6302 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterExistsComponentTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterExistsComponentTemplateRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.Cluster
 	public sealed class ClusterExistsComponentTemplateRequestParameters : RequestParameters<ClusterExistsComponentTemplateRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
@@ -44,7 +44,7 @@ public ClusterExistsComponentTemplateRequest(Elastic.Clients.Elasticsearch.Names
 		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
@@ -65,7 +65,7 @@ internal ClusterExistsComponentTemplateRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
 		protected override bool SupportsBody => false;
 		public ClusterExistsComponentTemplateRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public ClusterExistsComponentTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterExistsComponentTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public ClusterExistsComponentTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names name)
 		{
 			RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterGetComponentTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterGetComponentTemplateRequest.g.cs
index dd4d0383f63..0570840d778 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterGetComponentTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterGetComponentTemplateRequest.g.cs
@@ -34,7 +34,7 @@ public sealed class ClusterGetComponentTemplateRequestParameters : RequestParame
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class ClusterGetComponentTemplateRequest : PlainRequestBase<ClusterGetComponentTemplateRequestParameters>
@@ -57,7 +57,7 @@ public ClusterGetComponentTemplateRequest(Elastic.Clients.Elasticsearch.Name? na
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class ClusterGetComponentTemplateRequestDescriptor : RequestDescriptorBase<ClusterGetComponentTemplateRequestDescriptor, ClusterGetComponentTemplateRequestParameters>
@@ -72,7 +72,7 @@ public ClusterGetComponentTemplateRequestDescriptor()
 		protected override bool SupportsBody => false;
 		public ClusterGetComponentTemplateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 		public ClusterGetComponentTemplateRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public ClusterGetComponentTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterGetComponentTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public ClusterGetComponentTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name? name)
 		{
 			RouteValues.Optional("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterGetSettingsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterGetSettingsRequest.g.cs
index 52455a5ed54..ce794df2fa9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterGetSettingsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterGetSettingsRequest.g.cs
@@ -34,10 +34,10 @@ public sealed class ClusterGetSettingsRequestParameters : RequestParameters<Clus
 		public bool? IncludeDefaults { get => Q<bool?>("include_defaults"); set => Q("include_defaults", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class ClusterGetSettingsRequest : PlainRequestBase<ClusterGetSettingsRequestParameters>
@@ -52,10 +52,10 @@ public partial class ClusterGetSettingsRequest : PlainRequestBase<ClusterGetSett
 		public bool? IncludeDefaults { get => Q<bool?>("include_defaults"); set => Q("include_defaults", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class ClusterGetSettingsRequestDescriptor : RequestDescriptorBase<ClusterGetSettingsRequestDescriptor, ClusterGetSettingsRequestParameters>
@@ -70,8 +70,8 @@ public ClusterGetSettingsRequestDescriptor()
 		protected override bool SupportsBody => false;
 		public ClusterGetSettingsRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 		public ClusterGetSettingsRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults);
-		public ClusterGetSettingsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public ClusterGetSettingsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ClusterGetSettingsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterGetSettingsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 		}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthRequest.g.cs
index 2cdd5222232..feb7a2f3cb3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthRequest.g.cs
@@ -37,10 +37,10 @@ public sealed class ClusterHealthRequestParameters : RequestParameters<ClusterHe
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -84,10 +84,10 @@ public ClusterHealthRequest(Elastic.Clients.Elasticsearch.Indices? indices) : ba
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -121,8 +121,8 @@ public ClusterHealthRequestDescriptor()
 		public ClusterHealthRequestDescriptor<TDocument> ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public ClusterHealthRequestDescriptor<TDocument> Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level);
 		public ClusterHealthRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
-		public ClusterHealthRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public ClusterHealthRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ClusterHealthRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterHealthRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public ClusterHealthRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public ClusterHealthRequestDescriptor<TDocument> WaitForEvents(Elastic.Clients.Elasticsearch.WaitForEvents? waitForEvents) => Qs("wait_for_events", waitForEvents);
 		public ClusterHealthRequestDescriptor<TDocument> WaitForNoInitializingShards(bool? waitForNoInitializingShards = true) => Qs("wait_for_no_initializing_shards", waitForNoInitializingShards);
@@ -153,8 +153,8 @@ public ClusterHealthRequestDescriptor()
 		public ClusterHealthRequestDescriptor ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public ClusterHealthRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level);
 		public ClusterHealthRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public ClusterHealthRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public ClusterHealthRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ClusterHealthRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterHealthRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public ClusterHealthRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public ClusterHealthRequestDescriptor WaitForEvents(Elastic.Clients.Elasticsearch.WaitForEvents? waitForEvents) => Qs("wait_for_events", waitForEvents);
 		public ClusterHealthRequestDescriptor WaitForNoInitializingShards(bool? waitForNoInitializingShards = true) => Qs("wait_for_no_initializing_shards", waitForNoInitializingShards);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthResponse.g.cs
index 47ff4ebeff9..db28c917bb7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterHealthResponse.g.cs
@@ -76,9 +76,13 @@ public sealed partial class ClusterHealthResponse : ElasticsearchResponseBase
 		[JsonPropertyName("status")]
 		public Elastic.Clients.Elasticsearch.HealthStatus Status { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("task_max_waiting_in_queue")]
+		public Elastic.Clients.Elasticsearch.Duration? TaskMaxWaitingInQueue { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("task_max_waiting_in_queue_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis TaskMaxWaitingInQueueMillis { get; init; }
+		public long TaskMaxWaitingInQueueMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("timed_out")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPendingTasksRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPendingTasksRequest.g.cs
index ff00ef9f1ab..8dab2d3343b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPendingTasksRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPendingTasksRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class ClusterPendingTasksRequestParameters : RequestParameters<Clu
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class ClusterPendingTasksRequest : PlainRequestBase<ClusterPendingTasksRequestParameters>
@@ -43,7 +43,7 @@ public partial class ClusterPendingTasksRequest : PlainRequestBase<ClusterPendin
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class ClusterPendingTasksRequestDescriptor : RequestDescriptorBase<ClusterPendingTasksRequestDescriptor, ClusterPendingTasksRequestParameters>
@@ -57,7 +57,7 @@ public ClusterPendingTasksRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		public ClusterPendingTasksRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public ClusterPendingTasksRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterPendingTasksRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 		}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPostVotingConfigExclusionsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPostVotingConfigExclusionsRequest.g.cs
index f0c0067b493..2bcbf34a555 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPostVotingConfigExclusionsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPostVotingConfigExclusionsRequest.g.cs
@@ -34,7 +34,7 @@ public sealed class ClusterPostVotingConfigExclusionsRequestParameters : Request
 		public Elastic.Clients.Elasticsearch.Ids? NodeIds { get => Q<Elastic.Clients.Elasticsearch.Ids?>("node_ids"); set => Q("node_ids", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class ClusterPostVotingConfigExclusionsRequest : PlainRequestBase<ClusterPostVotingConfigExclusionsRequestParameters>
@@ -49,7 +49,7 @@ public partial class ClusterPostVotingConfigExclusionsRequest : PlainRequestBase
 		public Elastic.Clients.Elasticsearch.Ids? NodeIds { get => Q<Elastic.Clients.Elasticsearch.Ids?>("node_ids"); set => Q("node_ids", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class ClusterPostVotingConfigExclusionsRequestDescriptor : RequestDescriptorBase<ClusterPostVotingConfigExclusionsRequestDescriptor, ClusterPostVotingConfigExclusionsRequestParameters>
@@ -64,7 +64,7 @@ public ClusterPostVotingConfigExclusionsRequestDescriptor()
 		protected override bool SupportsBody => false;
 		public ClusterPostVotingConfigExclusionsRequestDescriptor NodeIds(Elastic.Clients.Elasticsearch.Ids? nodeIds) => Qs("node_ids", nodeIds);
 		public ClusterPostVotingConfigExclusionsRequestDescriptor NodeNames(Elastic.Clients.Elasticsearch.Names? nodeNames) => Qs("node_names", nodeNames);
-		public ClusterPostVotingConfigExclusionsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ClusterPostVotingConfigExclusionsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 		}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPutComponentTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPutComponentTemplateRequest.g.cs
index 7da8a2c28e9..34cf7b6ee93 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPutComponentTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPutComponentTemplateRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class ClusterPutComponentTemplateRequestParameters : RequestParame
 		public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class ClusterPutComponentTemplateRequest : PlainRequestBase<ClusterPutComponentTemplateRequestParameters>
@@ -47,7 +47,7 @@ public ClusterPutComponentTemplateRequest(Elastic.Clients.Elasticsearch.Name nam
 		public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("template")]
@@ -89,7 +89,7 @@ internal ClusterPutComponentTemplateRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		public ClusterPutComponentTemplateRequestDescriptor<TDocument> Create(bool? create = true) => Qs("create", create);
-		public ClusterPutComponentTemplateRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterPutComponentTemplateRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public ClusterPutComponentTemplateRequestDescriptor<TDocument> Name(Elastic.Clients.Elasticsearch.Name name)
 		{
 			RouteValues.Required("name", name);
@@ -298,7 +298,7 @@ internal ClusterPutComponentTemplateRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		public ClusterPutComponentTemplateRequestDescriptor Create(bool? create = true) => Qs("create", create);
-		public ClusterPutComponentTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterPutComponentTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public ClusterPutComponentTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name name)
 		{
 			RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPutSettingsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPutSettingsRequest.g.cs
index cc1d5fe6479..88a2394e844 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPutSettingsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterPutSettingsRequest.g.cs
@@ -31,10 +31,10 @@ public sealed class ClusterPutSettingsRequestParameters : RequestParameters<Clus
 		public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class ClusterPutSettingsRequest : PlainRequestBase<ClusterPutSettingsRequestParameters>
@@ -46,10 +46,10 @@ public partial class ClusterPutSettingsRequest : PlainRequestBase<ClusterPutSett
 		public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("persistent")]
@@ -71,8 +71,8 @@ public ClusterPutSettingsRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		public ClusterPutSettingsRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
-		public ClusterPutSettingsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public ClusterPutSettingsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ClusterPutSettingsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterPutSettingsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		private Dictionary<string, object>? PersistentValue { get; set; }
 
 		private Dictionary<string, object>? TransientValue { get; set; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterRerouteRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterRerouteRequest.g.cs
index bcb3c94daf5..083a3a9bcbb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterRerouteRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterRerouteRequest.g.cs
@@ -40,10 +40,10 @@ public sealed class ClusterRerouteRequestParameters : RequestParameters<ClusterR
 		public bool? RetryFailed { get => Q<bool?>("retry_failed"); set => Q("retry_failed", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class ClusterRerouteRequest : PlainRequestBase<ClusterRerouteRequestParameters>
@@ -64,10 +64,10 @@ public partial class ClusterRerouteRequest : PlainRequestBase<ClusterRerouteRequ
 		public bool? RetryFailed { get => Q<bool?>("retry_failed"); set => Q("retry_failed", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("commands")]
@@ -86,10 +86,10 @@ public ClusterRerouteRequestDescriptor()
 		protected override bool SupportsBody => true;
 		public ClusterRerouteRequestDescriptor DryRun(bool? dryRun = true) => Qs("dry_run", dryRun);
 		public ClusterRerouteRequestDescriptor Explain(bool? explain = true) => Qs("explain", explain);
-		public ClusterRerouteRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterRerouteRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public ClusterRerouteRequestDescriptor Metric(Elastic.Clients.Elasticsearch.Metrics? metric) => Qs("metric", metric);
 		public ClusterRerouteRequestDescriptor RetryFailed(bool? retryFailed = true) => Qs("retry_failed", retryFailed);
-		public ClusterRerouteRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ClusterRerouteRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		private IEnumerable<Elastic.Clients.Elasticsearch.Cluster.Command>? CommandsValue { get; set; }
 
 		private CommandDescriptor CommandsDescriptor { get; set; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStateRequest.g.cs
index 6c442de85a8..8997033be44 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStateRequest.g.cs
@@ -43,13 +43,13 @@ public sealed class ClusterStateRequestParameters : RequestParameters<ClusterSta
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public long? WaitForMetadataVersion { get => Q<long?>("wait_for_metadata_version"); set => Q("wait_for_metadata_version", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? WaitForTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("wait_for_timeout"); set => Q("wait_for_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_timeout"); set => Q("wait_for_timeout", value); }
 	}
 
 	public partial class ClusterStateRequest : PlainRequestBase<ClusterStateRequestParameters>
@@ -85,13 +85,13 @@ public ClusterStateRequest(Elastic.Clients.Elasticsearch.Metrics? metric, Elasti
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public long? WaitForMetadataVersion { get => Q<long?>("wait_for_metadata_version"); set => Q("wait_for_metadata_version", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? WaitForTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("wait_for_timeout"); set => Q("wait_for_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_timeout"); set => Q("wait_for_timeout", value); }
 	}
 
 	public sealed partial class ClusterStateRequestDescriptor<TDocument> : RequestDescriptorBase<ClusterStateRequestDescriptor<TDocument>, ClusterStateRequestParameters>
@@ -113,9 +113,9 @@ public ClusterStateRequestDescriptor(Elastic.Clients.Elasticsearch.Metrics? metr
 		public ClusterStateRequestDescriptor<TDocument> FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 		public ClusterStateRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 		public ClusterStateRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
-		public ClusterStateRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterStateRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public ClusterStateRequestDescriptor<TDocument> WaitForMetadataVersion(long? waitForMetadataVersion) => Qs("wait_for_metadata_version", waitForMetadataVersion);
-		public ClusterStateRequestDescriptor<TDocument> WaitForTimeout(Elastic.Clients.Elasticsearch.Time? waitForTimeout) => Qs("wait_for_timeout", waitForTimeout);
+		public ClusterStateRequestDescriptor<TDocument> WaitForTimeout(Elastic.Clients.Elasticsearch.Duration? waitForTimeout) => Qs("wait_for_timeout", waitForTimeout);
 		public ClusterStateRequestDescriptor<TDocument> Metric(Elastic.Clients.Elasticsearch.Metrics? metric)
 		{
 			RouteValues.Optional("metric", metric);
@@ -152,9 +152,9 @@ public ClusterStateRequestDescriptor(Elastic.Clients.Elasticsearch.Metrics? metr
 		public ClusterStateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 		public ClusterStateRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 		public ClusterStateRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public ClusterStateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ClusterStateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public ClusterStateRequestDescriptor WaitForMetadataVersion(long? waitForMetadataVersion) => Qs("wait_for_metadata_version", waitForMetadataVersion);
-		public ClusterStateRequestDescriptor WaitForTimeout(Elastic.Clients.Elasticsearch.Time? waitForTimeout) => Qs("wait_for_timeout", waitForTimeout);
+		public ClusterStateRequestDescriptor WaitForTimeout(Elastic.Clients.Elasticsearch.Duration? waitForTimeout) => Qs("wait_for_timeout", waitForTimeout);
 		public ClusterStateRequestDescriptor Metric(Elastic.Clients.Elasticsearch.Metrics? metric)
 		{
 			RouteValues.Optional("metric", metric);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStatsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStatsRequest.g.cs
index ecc9f71671d..a92a9ae9009 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStatsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/ClusterStatsRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class ClusterStatsRequestParameters : RequestParameters<ClusterSta
 		public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class ClusterStatsRequest : PlainRequestBase<ClusterStatsRequestParameters>
@@ -51,7 +51,7 @@ public ClusterStatsRequest(Elastic.Clients.Elasticsearch.NodeIds? node_id) : bas
 		public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class ClusterStatsRequestDescriptor : RequestDescriptorBase<ClusterStatsRequestDescriptor, ClusterStatsRequestParameters>
@@ -65,7 +65,7 @@ public ClusterStatsRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		public ClusterStatsRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
-		public ClusterStatsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ClusterStatsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public ClusterStatsRequestDescriptor NodeId(Elastic.Clients.Elasticsearch.NodeIds? node_id)
 		{
 			RouteValues.Optional("node_id", node_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateRequest.g.cs
index e2f8a0e473a..45ba5a45882 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateRequest.g.cs
@@ -37,7 +37,7 @@ public sealed class CreateRequestParameters : RequestParameters<CreateRequestPar
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public long? Version { get => Q<long?>("version"); set => Q("version", value); }
@@ -71,7 +71,7 @@ public CreateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public long? Version { get => Q<long?>("version"); set => Q("version", value); }
@@ -108,7 +108,7 @@ internal CreateRequestDescriptor()
 		public CreateRequestDescriptor<TDocument> Pipeline(string? pipeline) => Qs("pipeline", pipeline);
 		public CreateRequestDescriptor<TDocument> Refresh(Elastic.Clients.Elasticsearch.Refresh? refresh) => Qs("refresh", refresh);
 		public CreateRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public CreateRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public CreateRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public CreateRequestDescriptor<TDocument> Version(long? version) => Qs("version", version);
 		public CreateRequestDescriptor<TDocument> VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
 		public CreateRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs
index 192a2e69dde..f7b8a42167e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs
@@ -67,7 +67,7 @@ public sealed class DeleteByQueryRequestParameters : RequestParameters<DeleteByQ
 		public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
@@ -76,13 +76,13 @@ public sealed class DeleteByQueryRequestParameters : RequestParameters<DeleteByQ
 		public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Scroll { get => Q<Elastic.Clients.Elasticsearch.Time?>("scroll"); set => Q("scroll", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
 		[JsonIgnore]
 		public long? ScrollSize { get => Q<long?>("scroll_size"); set => Q("scroll_size", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("search_timeout"); set => Q("search_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("search_timeout"); set => Q("search_timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
@@ -100,7 +100,7 @@ public sealed class DeleteByQueryRequestParameters : RequestParameters<DeleteByQ
 		public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public bool? Version { get => Q<bool?>("version"); set => Q("version", value); }
@@ -161,7 +161,7 @@ public DeleteByQueryRequest(Elastic.Clients.Elasticsearch.Indices indices) : bas
 		public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
@@ -170,13 +170,13 @@ public DeleteByQueryRequest(Elastic.Clients.Elasticsearch.Indices indices) : bas
 		public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Scroll { get => Q<Elastic.Clients.Elasticsearch.Time?>("scroll"); set => Q("scroll", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
 		[JsonIgnore]
 		public long? ScrollSize { get => Q<long?>("scroll_size"); set => Q("scroll_size", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("search_timeout"); set => Q("search_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("search_timeout"); set => Q("search_timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
@@ -194,7 +194,7 @@ public DeleteByQueryRequest(Elastic.Clients.Elasticsearch.Indices indices) : bas
 		public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public bool? Version { get => Q<bool?>("version"); set => Q("version", value); }
@@ -246,17 +246,17 @@ internal DeleteByQueryRequestDescriptor()
 		public DeleteByQueryRequestDescriptor<TDocument> QueryLuceneSyntax(string? q) => Qs("q", q);
 		public DeleteByQueryRequestDescriptor<TDocument> Refresh(bool? refresh = true) => Qs("refresh", refresh);
 		public DeleteByQueryRequestDescriptor<TDocument> RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache);
-		public DeleteByQueryRequestDescriptor<TDocument> RequestsPerSecond(long? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
+		public DeleteByQueryRequestDescriptor<TDocument> RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
 		public DeleteByQueryRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public DeleteByQueryRequestDescriptor<TDocument> Scroll(Elastic.Clients.Elasticsearch.Time? scroll) => Qs("scroll", scroll);
+		public DeleteByQueryRequestDescriptor<TDocument> Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll);
 		public DeleteByQueryRequestDescriptor<TDocument> ScrollSize(long? scrollSize) => Qs("scroll_size", scrollSize);
-		public DeleteByQueryRequestDescriptor<TDocument> SearchTimeout(Elastic.Clients.Elasticsearch.Time? searchTimeout) => Qs("search_timeout", searchTimeout);
+		public DeleteByQueryRequestDescriptor<TDocument> SearchTimeout(Elastic.Clients.Elasticsearch.Duration? searchTimeout) => Qs("search_timeout", searchTimeout);
 		public DeleteByQueryRequestDescriptor<TDocument> SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 		public DeleteByQueryRequestDescriptor<TDocument> Slices(Elastic.Clients.Elasticsearch.Slices? slices) => Qs("slices", slices);
 		public DeleteByQueryRequestDescriptor<TDocument> Sort(IEnumerable<string>? sort) => Qs("sort", sort);
 		public DeleteByQueryRequestDescriptor<TDocument> Stats(IEnumerable<string>? stats) => Qs("stats", stats);
 		public DeleteByQueryRequestDescriptor<TDocument> TerminateAfter(long? terminateAfter) => Qs("terminate_after", terminateAfter);
-		public DeleteByQueryRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteByQueryRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteByQueryRequestDescriptor<TDocument> Version(bool? version = true) => Qs("version", version);
 		public DeleteByQueryRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public DeleteByQueryRequestDescriptor<TDocument> WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
@@ -407,17 +407,17 @@ internal DeleteByQueryRequestDescriptor()
 		public DeleteByQueryRequestDescriptor QueryLuceneSyntax(string? q) => Qs("q", q);
 		public DeleteByQueryRequestDescriptor Refresh(bool? refresh = true) => Qs("refresh", refresh);
 		public DeleteByQueryRequestDescriptor RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache);
-		public DeleteByQueryRequestDescriptor RequestsPerSecond(long? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
+		public DeleteByQueryRequestDescriptor RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
 		public DeleteByQueryRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public DeleteByQueryRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Time? scroll) => Qs("scroll", scroll);
+		public DeleteByQueryRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll);
 		public DeleteByQueryRequestDescriptor ScrollSize(long? scrollSize) => Qs("scroll_size", scrollSize);
-		public DeleteByQueryRequestDescriptor SearchTimeout(Elastic.Clients.Elasticsearch.Time? searchTimeout) => Qs("search_timeout", searchTimeout);
+		public DeleteByQueryRequestDescriptor SearchTimeout(Elastic.Clients.Elasticsearch.Duration? searchTimeout) => Qs("search_timeout", searchTimeout);
 		public DeleteByQueryRequestDescriptor SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 		public DeleteByQueryRequestDescriptor Slices(Elastic.Clients.Elasticsearch.Slices? slices) => Qs("slices", slices);
 		public DeleteByQueryRequestDescriptor Sort(IEnumerable<string>? sort) => Qs("sort", sort);
 		public DeleteByQueryRequestDescriptor Stats(IEnumerable<string>? stats) => Qs("stats", stats);
 		public DeleteByQueryRequestDescriptor TerminateAfter(long? terminateAfter) => Qs("terminate_after", terminateAfter);
-		public DeleteByQueryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteByQueryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteByQueryRequestDescriptor Version(bool? version = true) => Qs("version", version);
 		public DeleteByQueryRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public DeleteByQueryRequestDescriptor WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs
index bbe5591def3..d332f2715c2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs
@@ -56,13 +56,21 @@ public sealed partial class DeleteByQueryResponse : ElasticsearchResponseBase
 		[JsonPropertyName("task")]
 		public Elastic.Clients.Elasticsearch.TaskId? Task { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("throttled")]
+		public Elastic.Clients.Elasticsearch.Duration? Throttled { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("throttled_millis")]
-		public long? ThrottledMillis { get; init; }
+		public long ThrottledMillis { get; init; }
+
+		[JsonInclude]
+		[JsonPropertyName("throttled_until")]
+		public Elastic.Clients.Elasticsearch.Duration? ThrottledUntil { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("throttled_until_millis")]
-		public long? ThrottledUntilMillis { get; init; }
+		public long ThrottledUntilMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("timed_out")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleRequest.g.cs
index cbf2592607f..96c18e4257c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch
 	public sealed class DeleteByQueryRethrottleRequestParameters : RequestParameters<DeleteByQueryRethrottleRequestParameters>
 	{
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 	}
 
 	public partial class DeleteByQueryRethrottleRequest : PlainRequestBase<DeleteByQueryRethrottleRequestParameters>
@@ -41,7 +41,7 @@ public DeleteByQueryRethrottleRequest(Elastic.Clients.Elasticsearch.Id task_id)
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 	}
 
 	public sealed partial class DeleteByQueryRethrottleRequestDescriptor : RequestDescriptorBase<DeleteByQueryRethrottleRequestDescriptor, DeleteByQueryRethrottleRequestParameters>
@@ -58,7 +58,7 @@ internal DeleteByQueryRethrottleRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDeleteByQueryRethrottle;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
-		public DeleteByQueryRethrottleRequestDescriptor RequestsPerSecond(long? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
+		public DeleteByQueryRethrottleRequestDescriptor RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
 		public DeleteByQueryRethrottleRequestDescriptor TaskId(Elastic.Clients.Elasticsearch.Id task_id)
 		{
 			RouteValues.Required("task_id", task_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteRequest.g.cs
index 4c0ebf4a020..afecba5c91c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteRequest.g.cs
@@ -40,7 +40,7 @@ public sealed class DeleteRequestParameters : RequestParameters<DeleteRequestPar
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public long? Version { get => Q<long?>("version"); set => Q("version", value); }
@@ -74,7 +74,7 @@ public DeleteRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public long? Version { get => Q<long?>("version"); set => Q("version", value); }
@@ -124,7 +124,7 @@ internal DeleteRequestDescriptor()
 		public DeleteRequestDescriptor<TDocument> IfSeqNo(long? ifSeqNo) => Qs("if_seq_no", ifSeqNo);
 		public DeleteRequestDescriptor<TDocument> Refresh(Elastic.Clients.Elasticsearch.Refresh? refresh) => Qs("refresh", refresh);
 		public DeleteRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public DeleteRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteRequestDescriptor<TDocument> Version(long? version) => Qs("version", version);
 		public DeleteRequestDescriptor<TDocument> VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
 		public DeleteRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
@@ -163,7 +163,7 @@ internal DeleteRequestDescriptor()
 		public DeleteRequestDescriptor IfSeqNo(long? ifSeqNo) => Qs("if_seq_no", ifSeqNo);
 		public DeleteRequestDescriptor Refresh(Elastic.Clients.Elasticsearch.Refresh? refresh) => Qs("refresh", refresh);
 		public DeleteRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public DeleteRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteRequestDescriptor Version(long? version) => Qs("version", version);
 		public DeleteRequestDescriptor VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
 		public DeleteRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptRequest.g.cs
index d134452a025..4788eb555eb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch
 	public sealed class DeleteScriptRequestParameters : RequestParameters<DeleteScriptRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class DeleteScriptRequest : PlainRequestBase<DeleteScriptRequestParameters>
@@ -44,10 +44,10 @@ public DeleteScriptRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Re
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class DeleteScriptRequestDescriptor<TDocument> : RequestDescriptorBase<DeleteScriptRequestDescriptor<TDocument>, DeleteScriptRequestParameters>
@@ -64,8 +64,8 @@ internal DeleteScriptRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDeleteScript;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public DeleteScriptRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public DeleteScriptRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteScriptRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public DeleteScriptRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteScriptRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
@@ -91,8 +91,8 @@ internal DeleteScriptRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDeleteScript;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public DeleteScriptRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public DeleteScriptRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteScriptRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public DeleteScriptRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteScriptRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetStatusResponse.g.cs
index 4cd2b39efdf..bd6bc43d5da 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetStatusResponse.g.cs
@@ -30,7 +30,7 @@ public sealed partial class EqlGetStatusResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("expiration_time_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? ExpirationTimeInMillis { get; init; }
+		public long? ExpirationTimeInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("id")]
@@ -46,6 +46,6 @@ public sealed partial class EqlGetStatusResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("start_time_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? StartTimeInMillis { get; init; }
+		public long? StartTimeInMillis { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs
index ceb8ac4181d..9a5cda013a2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs
@@ -85,7 +85,7 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 
 		[JsonInclude]
 		[JsonPropertyName("keep_alive")]
-		public Elastic.Clients.Elasticsearch.Time? KeepAlive { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("keep_on_completion")]
@@ -93,7 +93,7 @@ public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 
 		[JsonInclude]
 		[JsonPropertyName("wait_for_completion_timeout")]
-		public Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("size")]
@@ -157,7 +157,7 @@ public EqlSearchRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsear
 
 		private int? FetchSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? KeepAliveValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? KeepAliveValue { get; set; }
 
 		private bool? KeepOnCompletionValue { get; set; }
 
@@ -173,7 +173,7 @@ public EqlSearchRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsear
 
 		private Elastic.Clients.Elasticsearch.Field? TimestampFieldValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeoutValue { get; set; }
 
 		public EqlSearchRequestDescriptor<TDocument> Fields(IEnumerable<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? fields)
 		{
@@ -271,7 +271,7 @@ public EqlSearchRequestDescriptor<TDocument> FetchSize(int? fetchSize)
 			return Self;
 		}
 
-		public EqlSearchRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive)
+		public EqlSearchRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive)
 		{
 			KeepAliveValue = keepAlive;
 			return Self;
@@ -331,7 +331,7 @@ public EqlSearchRequestDescriptor<TDocument> TimestampField<TValue>(Expression<F
 			return Self;
 		}
 
-		public EqlSearchRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout)
+		public EqlSearchRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout)
 		{
 			WaitForCompletionTimeoutValue = waitForCompletionTimeout;
 			return Self;
@@ -511,7 +511,7 @@ public EqlSearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices
 
 		private int? FetchSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? KeepAliveValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? KeepAliveValue { get; set; }
 
 		private bool? KeepOnCompletionValue { get; set; }
 
@@ -527,7 +527,7 @@ public EqlSearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices
 
 		private Elastic.Clients.Elasticsearch.Field? TimestampFieldValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeoutValue { get; set; }
 
 		public EqlSearchRequestDescriptor Fields(IEnumerable<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? fields)
 		{
@@ -631,7 +631,7 @@ public EqlSearchRequestDescriptor FetchSize(int? fetchSize)
 			return Self;
 		}
 
-		public EqlSearchRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive)
+		public EqlSearchRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive)
 		{
 			KeepAliveValue = keepAlive;
 			return Self;
@@ -703,7 +703,7 @@ public EqlSearchRequestDescriptor TimestampField<TDocument>(Expression<Func<TDoc
 			return Self;
 		}
 
-		public EqlSearchRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout)
+		public EqlSearchRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout)
 		{
 			WaitForCompletionTimeoutValue = waitForCompletionTimeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchResponse.g.cs
index 88dc9bac94c..1564164b5da 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchResponse.g.cs
@@ -46,6 +46,6 @@ public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponseBas
 
 		[JsonInclude]
 		[JsonPropertyName("took")]
-		public int? Took { get; init; }
+		public long? Took { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlRequest.g.cs
index da07b5ae6b8..aca6be9862c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Eql
 	public sealed class GetEqlRequestParameters : RequestParameters<GetEqlRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Time?>("keep_alive"); set => Q("keep_alive", value); }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 	}
 
 	public partial class GetEqlRequest : PlainRequestBase<GetEqlRequestParameters>
@@ -44,10 +44,10 @@ public GetEqlRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Time?>("keep_alive"); set => Q("keep_alive", value); }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 	}
 
 	public sealed partial class GetEqlRequestDescriptor<TDocument> : RequestDescriptorBase<GetEqlRequestDescriptor<TDocument>, GetEqlRequestParameters>
@@ -64,8 +64,8 @@ internal GetEqlRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGet;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public GetEqlRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive) => Qs("keep_alive", keepAlive);
-		public GetEqlRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+		public GetEqlRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
+		public GetEqlRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
 		public GetEqlRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
@@ -91,8 +91,8 @@ internal GetEqlRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGet;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public GetEqlRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive) => Qs("keep_alive", keepAlive);
-		public GetEqlRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+		public GetEqlRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
+		public GetEqlRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
 		public GetEqlRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlResponse.g.cs
index 7ad5bbcef05..a66b14b56a4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlResponse.g.cs
@@ -46,6 +46,6 @@ public sealed partial class GetEqlResponse<TEvent> : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("took")]
-		public int? Took { get; init; }
+		public long? Took { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Graph/GraphExploreRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Graph/GraphExploreRequest.g.cs
index f3a9320a7c4..6945487a7c5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Graph/GraphExploreRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Graph/GraphExploreRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class GraphExploreRequestParameters : RequestParameters<GraphExplo
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class GraphExploreRequest : PlainRequestBase<GraphExploreRequestParameters>
@@ -47,7 +47,7 @@ public GraphExploreRequest(Elastic.Clients.Elasticsearch.Indices indices) : base
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("connections")]
@@ -81,7 +81,7 @@ internal GraphExploreRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public GraphExploreRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public GraphExploreRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public GraphExploreRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public GraphExploreRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
@@ -319,7 +319,7 @@ internal GraphExploreRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public GraphExploreRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public GraphExploreRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public GraphExploreRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public GraphExploreRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmDeleteLifecycleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmDeleteLifecycleRequest.g.cs
index 07c95c5a2e8..60251528305 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmDeleteLifecycleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmDeleteLifecycleRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Ilm
 	public sealed class IlmDeleteLifecycleRequestParameters : RequestParameters<IlmDeleteLifecycleRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class IlmDeleteLifecycleRequest : PlainRequestBase<IlmDeleteLifecycleRequestParameters>
@@ -44,10 +44,10 @@ public IlmDeleteLifecycleRequest(Elastic.Clients.Elasticsearch.Name policy) : ba
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class IlmDeleteLifecycleRequestDescriptor : RequestDescriptorBase<IlmDeleteLifecycleRequestDescriptor, IlmDeleteLifecycleRequestParameters>
@@ -64,8 +64,8 @@ internal IlmDeleteLifecycleRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexLifecycleManagementDeleteLifecycle;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public IlmDeleteLifecycleRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public IlmDeleteLifecycleRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IlmDeleteLifecycleRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IlmDeleteLifecycleRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public IlmDeleteLifecycleRequestDescriptor Policy(Elastic.Clients.Elasticsearch.Name policy)
 		{
 			RouteValues.Required("policy", policy);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmExplainLifecycleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmExplainLifecycleRequest.g.cs
index 77d1a9046c6..8d300c94e19 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmExplainLifecycleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmExplainLifecycleRequest.g.cs
@@ -34,10 +34,10 @@ public sealed class IlmExplainLifecycleRequestParameters : RequestParameters<Ilm
 		public bool? OnlyManaged { get => Q<bool?>("only_managed"); set => Q("only_managed", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class IlmExplainLifecycleRequest : PlainRequestBase<IlmExplainLifecycleRequestParameters>
@@ -56,10 +56,10 @@ public IlmExplainLifecycleRequest(Elastic.Clients.Elasticsearch.IndexName index)
 		public bool? OnlyManaged { get => Q<bool?>("only_managed"); set => Q("only_managed", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class IlmExplainLifecycleRequestDescriptor<TDocument> : RequestDescriptorBase<IlmExplainLifecycleRequestDescriptor<TDocument>, IlmExplainLifecycleRequestParameters>
@@ -80,10 +80,10 @@ internal IlmExplainLifecycleRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexLifecycleManagementExplainLifecycle;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public IlmExplainLifecycleRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IlmExplainLifecycleRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public IlmExplainLifecycleRequestDescriptor<TDocument> OnlyErrors(bool? onlyErrors = true) => Qs("only_errors", onlyErrors);
 		public IlmExplainLifecycleRequestDescriptor<TDocument> OnlyManaged(bool? onlyManaged = true) => Qs("only_managed", onlyManaged);
-		public IlmExplainLifecycleRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IlmExplainLifecycleRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public IlmExplainLifecycleRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName index)
 		{
 			RouteValues.Required("index", index);
@@ -109,10 +109,10 @@ internal IlmExplainLifecycleRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexLifecycleManagementExplainLifecycle;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public IlmExplainLifecycleRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IlmExplainLifecycleRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public IlmExplainLifecycleRequestDescriptor OnlyErrors(bool? onlyErrors = true) => Qs("only_errors", onlyErrors);
 		public IlmExplainLifecycleRequestDescriptor OnlyManaged(bool? onlyManaged = true) => Qs("only_managed", onlyManaged);
-		public IlmExplainLifecycleRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IlmExplainLifecycleRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public IlmExplainLifecycleRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
 		{
 			RouteValues.Required("index", index);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmGetLifecycleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmGetLifecycleRequest.g.cs
index c296274b8fb..5dd7e4aefac 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmGetLifecycleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmGetLifecycleRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Ilm
 	public sealed class IlmGetLifecycleRequestParameters : RequestParameters<IlmGetLifecycleRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class IlmGetLifecycleRequest : PlainRequestBase<IlmGetLifecycleRequestParameters>
@@ -48,10 +48,10 @@ public IlmGetLifecycleRequest(Elastic.Clients.Elasticsearch.Name? policy) : base
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class IlmGetLifecycleRequestDescriptor : RequestDescriptorBase<IlmGetLifecycleRequestDescriptor, IlmGetLifecycleRequestParameters>
@@ -64,8 +64,8 @@ public IlmGetLifecycleRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexLifecycleManagementGetLifecycle;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public IlmGetLifecycleRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public IlmGetLifecycleRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IlmGetLifecycleRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IlmGetLifecycleRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public IlmGetLifecycleRequestDescriptor Policy(Elastic.Clients.Elasticsearch.Name? policy)
 		{
 			RouteValues.Optional("policy", policy);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmPutLifecycleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmPutLifecycleRequest.g.cs
index 49cc7693606..e5ccf81c64f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmPutLifecycleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmPutLifecycleRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Ilm
 	public sealed class IlmPutLifecycleRequestParameters : RequestParameters<IlmPutLifecycleRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class IlmPutLifecycleRequest : PlainRequestBase<IlmPutLifecycleRequestParameters>
@@ -44,10 +44,10 @@ public IlmPutLifecycleRequest(Elastic.Clients.Elasticsearch.Name policy) : base(
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class IlmPutLifecycleRequestDescriptor : RequestDescriptorBase<IlmPutLifecycleRequestDescriptor, IlmPutLifecycleRequestParameters>
@@ -64,8 +64,8 @@ internal IlmPutLifecycleRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexLifecycleManagementPutLifecycle;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => false;
-		public IlmPutLifecycleRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public IlmPutLifecycleRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IlmPutLifecycleRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IlmPutLifecycleRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public IlmPutLifecycleRequestDescriptor Policy(Elastic.Clients.Elasticsearch.Name policy)
 		{
 			RouteValues.Required("policy", policy);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmStartRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmStartRequest.g.cs
index 986ff7e2799..4b20979ad76 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmStartRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmStartRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Ilm
 	public sealed class IlmStartRequestParameters : RequestParameters<IlmStartRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class IlmStartRequest : PlainRequestBase<IlmStartRequestParameters>
@@ -40,10 +40,10 @@ public partial class IlmStartRequest : PlainRequestBase<IlmStartRequestParameter
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class IlmStartRequestDescriptor : RequestDescriptorBase<IlmStartRequestDescriptor, IlmStartRequestParameters>
@@ -56,8 +56,8 @@ public IlmStartRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexLifecycleManagementStart;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
-		public IlmStartRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public IlmStartRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IlmStartRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IlmStartRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 		}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmStopRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmStopRequest.g.cs
index 49a9c9fc425..ed5a6cbab58 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmStopRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ilm/IlmStopRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Ilm
 	public sealed class IlmStopRequestParameters : RequestParameters<IlmStopRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class IlmStopRequest : PlainRequestBase<IlmStopRequestParameters>
@@ -40,10 +40,10 @@ public partial class IlmStopRequest : PlainRequestBase<IlmStopRequestParameters>
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class IlmStopRequestDescriptor : RequestDescriptorBase<IlmStopRequestDescriptor, IlmStopRequestParameters>
@@ -56,8 +56,8 @@ public IlmStopRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexLifecycleManagementStop;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
-		public IlmStopRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public IlmStopRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IlmStopRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IlmStopRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 		}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneRequest.g.cs
index 750f5cef721..564ce7fe21f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement
 	public sealed class CloneRequestParameters : RequestParameters<CloneRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -47,10 +47,10 @@ public CloneRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clien
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -78,8 +78,8 @@ internal CloneRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClone;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public CloneRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public CloneRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public CloneRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public CloneRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public CloneRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public CloneRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName index)
 		{
@@ -142,8 +142,8 @@ internal CloneRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClone;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public CloneRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public CloneRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public CloneRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public CloneRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public CloneRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public CloneRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseRequest.g.cs
index cb3933391b0..1e4293e385c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseRequest.g.cs
@@ -37,10 +37,10 @@ public sealed class CloseRequestParameters : RequestParameters<CloseRequestParam
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -65,10 +65,10 @@ public CloseRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -91,8 +91,8 @@ internal CloseRequestDescriptor()
 		public CloseRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 		public CloseRequestDescriptor<TDocument> ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public CloseRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public CloseRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public CloseRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public CloseRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public CloseRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public CloseRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public CloseRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
@@ -122,8 +122,8 @@ internal CloseRequestDescriptor()
 		public CloseRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 		public CloseRequestDescriptor ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public CloseRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public CloseRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public CloseRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public CloseRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public CloseRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public CloseRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public CloseRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateRequest.g.cs
index b59c6b57fb6..b0e69e18a45 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement
 	public sealed class CreateRequestParameters : RequestParameters<CreateRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -47,10 +47,10 @@ public CreateRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r =>
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -86,8 +86,8 @@ internal CreateRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementCreate;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public CreateRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public CreateRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public CreateRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public CreateRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public CreateRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public CreateRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName index)
 		{
@@ -222,8 +222,8 @@ internal CreateRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementCreate;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public CreateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public CreateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public CreateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public CreateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public CreateRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public CreateRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteAliasRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteAliasRequest.g.cs
index d45aa76f0e8..24758beccde 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteAliasRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteAliasRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement
 	public sealed class DeleteAliasRequestParameters : RequestParameters<DeleteAliasRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class DeleteAliasRequest : PlainRequestBase<DeleteAliasRequestParameters>
@@ -44,10 +44,10 @@ public DeleteAliasRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class DeleteAliasRequestDescriptor<TDocument> : RequestDescriptorBase<DeleteAliasRequestDescriptor<TDocument>, DeleteAliasRequestParameters>
@@ -64,8 +64,8 @@ internal DeleteAliasRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteAlias;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public DeleteAliasRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public DeleteAliasRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteAliasRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public DeleteAliasRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteAliasRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
@@ -97,8 +97,8 @@ internal DeleteAliasRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteAlias;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public DeleteAliasRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public DeleteAliasRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteAliasRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public DeleteAliasRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteAliasRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateRequest.g.cs
index cb6660589d5..a9127e97835 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement
 	public sealed class DeleteIndexTemplateRequestParameters : RequestParameters<DeleteIndexTemplateRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class DeleteIndexTemplateRequest : PlainRequestBase<DeleteIndexTemplateRequestParameters>
@@ -44,10 +44,10 @@ public DeleteIndexTemplateRequest(Elastic.Clients.Elasticsearch.Names name) : ba
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class DeleteIndexTemplateRequestDescriptor : RequestDescriptorBase<DeleteIndexTemplateRequestDescriptor, DeleteIndexTemplateRequestParameters>
@@ -64,8 +64,8 @@ internal DeleteIndexTemplateRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteIndexTemplate;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public DeleteIndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public DeleteIndexTemplateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteIndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public DeleteIndexTemplateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteIndexTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names name)
 		{
 			RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteRequest.g.cs
index 0b5d207a3ed..2c309d1743e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteRequest.g.cs
@@ -37,10 +37,10 @@ public sealed class DeleteRequestParameters : RequestParameters<DeleteRequestPar
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class DeleteRequest : PlainRequestBase<DeleteRequestParameters>
@@ -62,10 +62,10 @@ public DeleteRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r =>
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class DeleteRequestDescriptor<TDocument> : RequestDescriptorBase<DeleteRequestDescriptor<TDocument>, DeleteRequestParameters>
@@ -85,8 +85,8 @@ internal DeleteRequestDescriptor()
 		public DeleteRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 		public DeleteRequestDescriptor<TDocument> ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public DeleteRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public DeleteRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public DeleteRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public DeleteRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
@@ -115,8 +115,8 @@ internal DeleteRequestDescriptor()
 		public DeleteRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 		public DeleteRequestDescriptor ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public DeleteRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public DeleteRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public DeleteRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public DeleteRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateRequest.g.cs
index d7f14ec2c91..551dd284d38 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement
 	public sealed class DeleteTemplateRequestParameters : RequestParameters<DeleteTemplateRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class DeleteTemplateRequest : PlainRequestBase<DeleteTemplateRequestParameters>
@@ -44,10 +44,10 @@ public DeleteTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r =
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class DeleteTemplateRequestDescriptor : RequestDescriptorBase<DeleteTemplateRequestDescriptor, DeleteTemplateRequestParameters>
@@ -64,8 +64,8 @@ internal DeleteTemplateRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteTemplate;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public DeleteTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public DeleteTemplateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public DeleteTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public DeleteTemplateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public DeleteTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name name)
 		{
 			RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsIndexTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsIndexTemplateRequest.g.cs
index 9c0f4abec32..59fa601cd62 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsIndexTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsIndexTemplateRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement
 	public sealed class ExistsIndexTemplateRequestParameters : RequestParameters<ExistsIndexTemplateRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class ExistsIndexTemplateRequest : PlainRequestBase<ExistsIndexTemplateRequestParameters>
@@ -41,7 +41,7 @@ public ExistsIndexTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : bas
 		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class ExistsIndexTemplateRequestDescriptor : RequestDescriptorBase<ExistsIndexTemplateRequestDescriptor, ExistsIndexTemplateRequestParameters>
@@ -58,7 +58,7 @@ internal ExistsIndexTemplateRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementExistsIndexTemplate;
 		protected override HttpMethod HttpMethod => HttpMethod.HEAD;
 		protected override bool SupportsBody => false;
-		public ExistsIndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ExistsIndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public ExistsIndexTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name name)
 		{
 			RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsTemplateRequest.g.cs
index f8a11145cf1..ace2cb9caaf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsTemplateRequest.g.cs
@@ -34,7 +34,7 @@ public sealed class ExistsTemplateRequestParameters : RequestParameters<ExistsTe
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class ExistsTemplateRequest : PlainRequestBase<ExistsTemplateRequestParameters>
@@ -53,7 +53,7 @@ public ExistsTemplateRequest(Elastic.Clients.Elasticsearch.Names name) : base(r
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class ExistsTemplateRequestDescriptor : RequestDescriptorBase<ExistsTemplateRequestDescriptor, ExistsTemplateRequestParameters>
@@ -72,7 +72,7 @@ internal ExistsTemplateRequestDescriptor()
 		protected override bool SupportsBody => false;
 		public ExistsTemplateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 		public ExistsTemplateRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public ExistsTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ExistsTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public ExistsTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names name)
 		{
 			RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetRequest.g.cs
index f0b70458a1b..128643b57e8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetRequest.g.cs
@@ -46,7 +46,7 @@ public sealed class GetRequestParameters : RequestParameters<GetRequestParameter
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.IndexManagement.Features? Features { get => Q<Elastic.Clients.Elasticsearch.IndexManagement.Features?>("features"); set => Q("features", value); }
@@ -80,7 +80,7 @@ public GetRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.R
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.IndexManagement.Features? Features { get => Q<Elastic.Clients.Elasticsearch.IndexManagement.Features?>("features"); set => Q("features", value); }
@@ -107,7 +107,7 @@ internal GetRequestDescriptor()
 		public GetRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 		public GetRequestDescriptor<TDocument> IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults);
 		public GetRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
-		public GetRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public GetRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public GetRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
@@ -140,7 +140,7 @@ internal GetRequestDescriptor()
 		public GetRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 		public GetRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults);
 		public GetRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public GetRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public GetRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public GetRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndexTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndexTemplateRequest.g.cs
index 36e207cee9c..5debc8ceb80 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndexTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndexTemplateRequest.g.cs
@@ -34,7 +34,7 @@ public sealed class IndexTemplateRequestParameters : RequestParameters<IndexTemp
 		public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class IndexTemplateRequest : PlainRequestBase<IndexTemplateRequestParameters>
@@ -57,7 +57,7 @@ public IndexTemplateRequest(Elastic.Clients.Elasticsearch.Name? name) : base(r =
 		public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class IndexTemplateRequestDescriptor : RequestDescriptorBase<IndexTemplateRequestDescriptor, IndexTemplateRequestParameters>
@@ -72,7 +72,7 @@ public IndexTemplateRequestDescriptor()
 		protected override bool SupportsBody => false;
 		public IndexTemplateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 		public IndexTemplateRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public IndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public IndexTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name? name)
 		{
 			RouteValues.Optional("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MappingRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MappingRequest.g.cs
index 909c83b4458..4ba45747d33 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MappingRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MappingRequest.g.cs
@@ -40,7 +40,7 @@ public sealed class MappingRequestParameters : RequestParameters<MappingRequestP
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class MappingRequest : PlainRequestBase<MappingRequestParameters>
@@ -69,7 +69,7 @@ public MappingRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class MappingRequestDescriptor<TDocument> : RequestDescriptorBase<MappingRequestDescriptor<TDocument>, MappingRequestParameters>
@@ -86,7 +86,7 @@ public MappingRequestDescriptor()
 		public MappingRequestDescriptor<TDocument> ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public MappingRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 		public MappingRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
-		public MappingRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public MappingRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public MappingRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 		{
 			RouteValues.Optional("index", indices);
@@ -112,7 +112,7 @@ public MappingRequestDescriptor()
 		public MappingRequestDescriptor ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public MappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 		public MappingRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public MappingRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public MappingRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public MappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 		{
 			RouteValues.Optional("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenRequest.g.cs
index 26deede550f..a93c485ed63 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenRequest.g.cs
@@ -37,10 +37,10 @@ public sealed class OpenRequestParameters : RequestParameters<OpenRequestParamet
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -65,10 +65,10 @@ public OpenRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -91,8 +91,8 @@ internal OpenRequestDescriptor()
 		public OpenRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 		public OpenRequestDescriptor<TDocument> ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public OpenRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public OpenRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public OpenRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public OpenRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public OpenRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public OpenRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public OpenRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
@@ -122,8 +122,8 @@ internal OpenRequestDescriptor()
 		public OpenRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 		public OpenRequestDescriptor ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public OpenRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public OpenRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public OpenRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public OpenRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public OpenRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public OpenRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public OpenRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasRequest.g.cs
index 87e464334b0..a4faa045048 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement
 	public sealed class PutAliasRequestParameters : RequestParameters<PutAliasRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class PutAliasRequest : PlainRequestBase<PutAliasRequestParameters>
@@ -44,10 +44,10 @@ public PutAliasRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.Cl
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("filter")]
@@ -84,8 +84,8 @@ internal PutAliasRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutAlias;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public PutAliasRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public PutAliasRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public PutAliasRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public PutAliasRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public PutAliasRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
@@ -221,8 +221,8 @@ internal PutAliasRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutAlias;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public PutAliasRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public PutAliasRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public PutAliasRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public PutAliasRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public PutAliasRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingRequest.g.cs
index 13d56345fb5..3ba19a3dab8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingRequest.g.cs
@@ -37,10 +37,10 @@ public sealed class PutMappingRequestParameters : RequestParameters<PutMappingRe
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public bool? WriteIndexOnly { get => Q<bool?>("write_index_only"); set => Q("write_index_only", value); }
@@ -65,10 +65,10 @@ public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public bool? WriteIndexOnly { get => Q<bool?>("write_index_only"); set => Q("write_index_only", value); }
@@ -135,8 +135,8 @@ internal PutMappingRequestDescriptor()
 		public PutMappingRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 		public PutMappingRequestDescriptor<TDocument> ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public PutMappingRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public PutMappingRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public PutMappingRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public PutMappingRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public PutMappingRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public PutMappingRequestDescriptor<TDocument> WriteIndexOnly(bool? writeIndexOnly = true) => Qs("write_index_only", writeIndexOnly);
 		public PutMappingRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
@@ -432,8 +432,8 @@ internal PutMappingRequestDescriptor()
 		public PutMappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 		public PutMappingRequestDescriptor ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public PutMappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public PutMappingRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public PutMappingRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public PutMappingRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public PutMappingRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public PutMappingRequestDescriptor WriteIndexOnly(bool? writeIndexOnly = true) => Qs("write_index_only", writeIndexOnly);
 		public PutMappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutSettingsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutSettingsRequest.g.cs
index 2b8546e9103..7eadebfec52 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutSettingsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutSettingsRequest.g.cs
@@ -40,13 +40,13 @@ public sealed class PutSettingsRequestParameters : RequestParameters<PutSettings
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? PreserveExisting { get => Q<bool?>("preserve_existing"); set => Q("preserve_existing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class PutSettingsRequest : PlainRequestBase<PutSettingsRequestParameters>
@@ -75,13 +75,13 @@ public PutSettingsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? PreserveExisting { get => Q<bool?>("preserve_existing"); set => Q("preserve_existing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class PutSettingsRequestDescriptor<TDocument> : RequestDescriptorBase<PutSettingsRequestDescriptor<TDocument>, PutSettingsRequestParameters>
@@ -98,9 +98,9 @@ public PutSettingsRequestDescriptor()
 		public PutSettingsRequestDescriptor<TDocument> ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public PutSettingsRequestDescriptor<TDocument> FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 		public PutSettingsRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public PutSettingsRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public PutSettingsRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public PutSettingsRequestDescriptor<TDocument> PreserveExisting(bool? preserveExisting = true) => Qs("preserve_existing", preserveExisting);
-		public PutSettingsRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public PutSettingsRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public PutSettingsRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 		{
 			RouteValues.Optional("index", indices);
@@ -126,9 +126,9 @@ public PutSettingsRequestDescriptor()
 		public PutSettingsRequestDescriptor ExpandWildcards(Elastic.Clients.Elasticsearch.ExpandWildcards? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 		public PutSettingsRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 		public PutSettingsRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public PutSettingsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public PutSettingsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public PutSettingsRequestDescriptor PreserveExisting(bool? preserveExisting = true) => Qs("preserve_existing", preserveExisting);
-		public PutSettingsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public PutSettingsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public PutSettingsRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 		{
 			RouteValues.Optional("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs
index 6488e0bc53f..e39a22ae93d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs
@@ -34,10 +34,10 @@ public sealed class PutTemplateRequestParameters : RequestParameters<PutTemplate
 		public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class PutTemplateRequest : PlainRequestBase<PutTemplateRequestParameters>
@@ -56,10 +56,10 @@ public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r
 		public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("aliases")]
@@ -102,8 +102,8 @@ internal PutTemplateRequestDescriptor()
 		protected override bool SupportsBody => true;
 		public PutTemplateRequestDescriptor Create(bool? create = true) => Qs("create", create);
 		public PutTemplateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
-		public PutTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public PutTemplateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public PutTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public PutTemplateRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public PutTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name name)
 		{
 			RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverRequest.g.cs
index e4880527586..05f45cf4726 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverRequest.g.cs
@@ -31,10 +31,10 @@ public sealed class RolloverRequestParameters : RequestParameters<RolloverReques
 		public bool? DryRun { get => Q<bool?>("dry_run"); set => Q("dry_run", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -57,10 +57,10 @@ public RolloverRequest(Elastic.Clients.Elasticsearch.IndexAlias alias, Elastic.C
 		public bool? DryRun { get => Q<bool?>("dry_run"); set => Q("dry_run", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -101,8 +101,8 @@ internal RolloverRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public RolloverRequestDescriptor DryRun(bool? dryRun = true) => Qs("dry_run", dryRun);
-		public RolloverRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public RolloverRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public RolloverRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public RolloverRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public RolloverRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public RolloverRequestDescriptor Alias(Elastic.Clients.Elasticsearch.IndexAlias alias)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SettingsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SettingsRequest.g.cs
index c10752edbf2..1ee6cc8f917 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SettingsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SettingsRequest.g.cs
@@ -46,7 +46,7 @@ public sealed class SettingsRequestParameters : RequestParameters<SettingsReques
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class SettingsRequest : PlainRequestBase<SettingsRequestParameters>
@@ -89,7 +89,7 @@ public SettingsRequest(Elastic.Clients.Elasticsearch.Names? name) : base(r => r.
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class SettingsRequestDescriptor<TDocument> : RequestDescriptorBase<SettingsRequestDescriptor<TDocument>, SettingsRequestParameters>
@@ -116,7 +116,7 @@ public SettingsRequestDescriptor(Elastic.Clients.Elasticsearch.Names? name) : ba
 		public SettingsRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 		public SettingsRequestDescriptor<TDocument> IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults);
 		public SettingsRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
-		public SettingsRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SettingsRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public SettingsRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 		{
 			RouteValues.Optional("index", indices);
@@ -158,7 +158,7 @@ public SettingsRequestDescriptor(Elastic.Clients.Elasticsearch.Names? name) : ba
 		public SettingsRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 		public SettingsRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults);
 		public SettingsRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public SettingsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SettingsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public SettingsRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 		{
 			RouteValues.Optional("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkRequest.g.cs
index ba6f0b1e724..afd89ba543f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement
 	public sealed class ShrinkRequestParameters : RequestParameters<ShrinkRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -47,10 +47,10 @@ public ShrinkRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -78,8 +78,8 @@ internal ShrinkRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementShrink;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public ShrinkRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public ShrinkRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ShrinkRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ShrinkRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public ShrinkRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public ShrinkRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName index)
 		{
@@ -142,8 +142,8 @@ internal ShrinkRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementShrink;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public ShrinkRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public ShrinkRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ShrinkRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ShrinkRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public ShrinkRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public ShrinkRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateRequest.g.cs
index 23153286791..0533aafebec 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class SimulateIndexTemplateRequestParameters : RequestParameters<S
 		public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class SimulateIndexTemplateRequest : PlainRequestBase<SimulateIndexTemplateRequestParameters>
@@ -47,7 +47,7 @@ public SimulateIndexTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : b
 		public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("allow_auto_create")]
@@ -97,7 +97,7 @@ internal SimulateIndexTemplateRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public SimulateIndexTemplateRequestDescriptor<TDocument> Create(bool? create = true) => Qs("create", create);
-		public SimulateIndexTemplateRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SimulateIndexTemplateRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public SimulateIndexTemplateRequestDescriptor<TDocument> Name(Elastic.Clients.Elasticsearch.Name name)
 		{
 			RouteValues.Required("name", name);
@@ -302,7 +302,7 @@ internal SimulateIndexTemplateRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public SimulateIndexTemplateRequestDescriptor Create(bool? create = true) => Qs("create", create);
-		public SimulateIndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SimulateIndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public SimulateIndexTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name name)
 		{
 			RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateRequest.g.cs
index 417f7dd9075..7cd613bd763 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class SimulateTemplateRequestParameters : RequestParameters<Simula
 		public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class SimulateTemplateRequest : PlainRequestBase<SimulateTemplateRequestParameters>
@@ -51,7 +51,7 @@ public SimulateTemplateRequest(Elastic.Clients.Elasticsearch.Name? name) : base(
 		public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class SimulateTemplateRequestDescriptor : RequestDescriptorBase<SimulateTemplateRequestDescriptor, SimulateTemplateRequestParameters>
@@ -65,7 +65,7 @@ public SimulateTemplateRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		public SimulateTemplateRequestDescriptor Create(bool? create = true) => Qs("create", create);
-		public SimulateTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SimulateTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public SimulateTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name? name)
 		{
 			RouteValues.Optional("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitRequest.g.cs
index a2f8ec37a45..a31fd29f3a0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement
 	public sealed class SplitRequestParameters : RequestParameters<SplitRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -47,10 +47,10 @@ public SplitRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clien
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -78,8 +78,8 @@ internal SplitRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSplit;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public SplitRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public SplitRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public SplitRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SplitRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public SplitRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public SplitRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName index)
 		{
@@ -142,8 +142,8 @@ internal SplitRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSplit;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public SplitRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public SplitRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public SplitRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SplitRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public SplitRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public SplitRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/TemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/TemplateRequest.g.cs
index a418a0d49e4..4215b1f8c78 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/TemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/TemplateRequest.g.cs
@@ -34,7 +34,7 @@ public sealed class TemplateRequestParameters : RequestParameters<TemplateReques
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class TemplateRequest : PlainRequestBase<TemplateRequestParameters>
@@ -57,7 +57,7 @@ public TemplateRequest(Elastic.Clients.Elasticsearch.Names? name) : base(r => r.
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class TemplateRequestDescriptor : RequestDescriptorBase<TemplateRequestDescriptor, TemplateRequestParameters>
@@ -72,7 +72,7 @@ public TemplateRequestDescriptor()
 		protected override bool SupportsBody => false;
 		public TemplateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 		public TemplateRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public TemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public TemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public TemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names? name)
 		{
 			RouteValues.Optional("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexRequest.g.cs
index f75121dc79c..159470c707c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexRequest.g.cs
@@ -46,7 +46,7 @@ public sealed class IndexRequestParameters : RequestParameters<IndexRequestParam
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public long? Version { get => Q<long?>("version"); set => Q("version", value); }
@@ -96,7 +96,7 @@ public IndexRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public long? Version { get => Q<long?>("version"); set => Q("version", value); }
@@ -144,7 +144,7 @@ internal IndexRequestDescriptor()
 		public IndexRequestDescriptor<TDocument> Refresh(Elastic.Clients.Elasticsearch.Refresh? refresh) => Qs("refresh", refresh);
 		public IndexRequestDescriptor<TDocument> RequireAlias(bool? requireAlias = true) => Qs("require_alias", requireAlias);
 		public IndexRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public IndexRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IndexRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public IndexRequestDescriptor<TDocument> Version(long? version) => Qs("version", version);
 		public IndexRequestDescriptor<TDocument> VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
 		public IndexRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestDeletePipelineRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestDeletePipelineRequest.g.cs
index eb46c4383c5..f69ec95031f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestDeletePipelineRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestDeletePipelineRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Ingest
 	public sealed class IngestDeletePipelineRequestParameters : RequestParameters<IngestDeletePipelineRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class IngestDeletePipelineRequest : PlainRequestBase<IngestDeletePipelineRequestParameters>
@@ -44,10 +44,10 @@ public IngestDeletePipelineRequest(Elastic.Clients.Elasticsearch.Id id) : base(r
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class IngestDeletePipelineRequestDescriptor<TDocument> : RequestDescriptorBase<IngestDeletePipelineRequestDescriptor<TDocument>, IngestDeletePipelineRequestParameters>
@@ -64,8 +64,8 @@ internal IngestDeletePipelineRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestDeletePipeline;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public IngestDeletePipelineRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public IngestDeletePipelineRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IngestDeletePipelineRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IngestDeletePipelineRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public IngestDeletePipelineRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
@@ -91,8 +91,8 @@ internal IngestDeletePipelineRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestDeletePipeline;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public IngestDeletePipelineRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public IngestDeletePipelineRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IngestDeletePipelineRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IngestDeletePipelineRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public IngestDeletePipelineRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestGetPipelineRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestGetPipelineRequest.g.cs
index 1d589366260..0c8b181b0fa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestGetPipelineRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestGetPipelineRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.Ingest
 	public sealed class IngestGetPipelineRequestParameters : RequestParameters<IngestGetPipelineRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? Summary { get => Q<bool?>("summary"); set => Q("summary", value); }
@@ -48,7 +48,7 @@ public IngestGetPipelineRequest(Elastic.Clients.Elasticsearch.Id? id) : base(r =
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? Summary { get => Q<bool?>("summary"); set => Q("summary", value); }
@@ -64,7 +64,7 @@ public IngestGetPipelineRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestGetPipeline;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public IngestGetPipelineRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IngestGetPipelineRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public IngestGetPipelineRequestDescriptor<TDocument> Summary(bool? summary = true) => Qs("summary", summary);
 		public IngestGetPipelineRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id? id)
 		{
@@ -87,7 +87,7 @@ public IngestGetPipelineRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestGetPipeline;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public IngestGetPipelineRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IngestGetPipelineRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public IngestGetPipelineRequestDescriptor Summary(bool? summary = true) => Qs("summary", summary);
 		public IngestGetPipelineRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id? id)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestPutPipelineRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestPutPipelineRequest.g.cs
index e59c27e823e..04144d68c25 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestPutPipelineRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/IngestPutPipelineRequest.g.cs
@@ -28,10 +28,13 @@ namespace Elastic.Clients.Elasticsearch.Ingest
 	public sealed class IngestPutPipelineRequestParameters : RequestParameters<IngestPutPipelineRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
+
+		[JsonIgnore]
+		public long? IfVersion { get => Q<long?>("if_version"); set => Q("if_version", value); }
 	}
 
 	public partial class IngestPutPipelineRequest : PlainRequestBase<IngestPutPipelineRequestParameters>
@@ -44,10 +47,13 @@ public IngestPutPipelineRequest(Elastic.Clients.Elasticsearch.Id id) : base(r =>
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
+
+		[JsonIgnore]
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public long? IfVersion { get => Q<long?>("if_version"); set => Q("if_version", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("_meta")]
@@ -84,8 +90,9 @@ internal IngestPutPipelineRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestPutPipeline;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public IngestPutPipelineRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public IngestPutPipelineRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IngestPutPipelineRequestDescriptor<TDocument> IfVersion(long? ifVersion) => Qs("if_version", ifVersion);
+		public IngestPutPipelineRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IngestPutPipelineRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public IngestPutPipelineRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
@@ -297,8 +304,9 @@ internal IngestPutPipelineRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestPutPipeline;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public IngestPutPipelineRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public IngestPutPipelineRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public IngestPutPipelineRequestDescriptor IfVersion(long? ifVersion) => Qs("if_version", ifVersion);
+		public IngestPutPipelineRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public IngestPutPipelineRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public IngestPutPipelineRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlCloseJobRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlCloseJobRequest.g.cs
index 7c9741dd174..1caaa0537d0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlCloseJobRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlCloseJobRequest.g.cs
@@ -48,7 +48,7 @@ public MlCloseJobRequest(Elastic.Clients.Elasticsearch.Id job_id) : base(r => r.
 
 		[JsonInclude]
 		[JsonPropertyName("timeout")]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get; set; }
 	}
 
 	public sealed partial class MlCloseJobRequestDescriptor : RequestDescriptorBase<MlCloseJobRequestDescriptor, MlCloseJobRequestParameters>
@@ -75,7 +75,7 @@ public MlCloseJobRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id job_id
 
 		private bool? ForceValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? TimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; }
 
 		public MlCloseJobRequestDescriptor AllowNoMatch(bool? allowNoMatch = true)
 		{
@@ -89,7 +89,7 @@ public MlCloseJobRequestDescriptor Force(bool? force = true)
 			return Self;
 		}
 
-		public MlCloseJobRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout)
+		public MlCloseJobRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout)
 		{
 			TimeoutValue = timeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteDataFrameAnalyticsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteDataFrameAnalyticsRequest.g.cs
index b6e5af15d87..e7fc318714e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteDataFrameAnalyticsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteDataFrameAnalyticsRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class MlDeleteDataFrameAnalyticsRequestParameters : RequestParamet
 		public bool? Force { get => Q<bool?>("force"); set => Q("force", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class MlDeleteDataFrameAnalyticsRequest : PlainRequestBase<MlDeleteDataFrameAnalyticsRequestParameters>
@@ -47,7 +47,7 @@ public MlDeleteDataFrameAnalyticsRequest(Elastic.Clients.Elasticsearch.Id id) :
 		public bool? Force { get => Q<bool?>("force"); set => Q("force", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class MlDeleteDataFrameAnalyticsRequestDescriptor<TDocument> : RequestDescriptorBase<MlDeleteDataFrameAnalyticsRequestDescriptor<TDocument>, MlDeleteDataFrameAnalyticsRequestParameters>
@@ -65,7 +65,7 @@ internal MlDeleteDataFrameAnalyticsRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		public MlDeleteDataFrameAnalyticsRequestDescriptor<TDocument> Force(bool? force = true) => Qs("force", force);
-		public MlDeleteDataFrameAnalyticsRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public MlDeleteDataFrameAnalyticsRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public MlDeleteDataFrameAnalyticsRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
@@ -92,7 +92,7 @@ internal MlDeleteDataFrameAnalyticsRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		public MlDeleteDataFrameAnalyticsRequestDescriptor Force(bool? force = true) => Qs("force", force);
-		public MlDeleteDataFrameAnalyticsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public MlDeleteDataFrameAnalyticsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public MlDeleteDataFrameAnalyticsRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteExpiredDataRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteExpiredDataRequest.g.cs
index d1d21bbd873..c8eacef233a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteExpiredDataRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteExpiredDataRequest.g.cs
@@ -48,7 +48,7 @@ public MlDeleteExpiredDataRequest(Elastic.Clients.Elasticsearch.Id? job_id) : ba
 
 		[JsonInclude]
 		[JsonPropertyName("timeout")]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get; set; }
 	}
 
 	public sealed partial class MlDeleteExpiredDataRequestDescriptor : RequestDescriptorBase<MlDeleteExpiredDataRequestDescriptor, MlDeleteExpiredDataRequestParameters>
@@ -69,7 +69,7 @@ public MlDeleteExpiredDataRequestDescriptor JobId(Elastic.Clients.Elasticsearch.
 
 		private float? RequestsPerSecondValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? TimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; }
 
 		public MlDeleteExpiredDataRequestDescriptor RequestsPerSecond(float? requestsPerSecond)
 		{
@@ -77,7 +77,7 @@ public MlDeleteExpiredDataRequestDescriptor RequestsPerSecond(float? requestsPer
 			return Self;
 		}
 
-		public MlDeleteExpiredDataRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout)
+		public MlDeleteExpiredDataRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout)
 		{
 			TimeoutValue = timeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteForecastRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteForecastRequest.g.cs
index 4dda59ea6da..b2281cfaad9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteForecastRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlDeleteForecastRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class MlDeleteForecastRequestParameters : RequestParameters<MlDele
 		public bool? AllowNoForecasts { get => Q<bool?>("allow_no_forecasts"); set => Q("allow_no_forecasts", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class MlDeleteForecastRequest : PlainRequestBase<MlDeleteForecastRequestParameters>
@@ -51,7 +51,7 @@ public MlDeleteForecastRequest(Elastic.Clients.Elasticsearch.Id job_id, Elastic.
 		public bool? AllowNoForecasts { get => Q<bool?>("allow_no_forecasts"); set => Q("allow_no_forecasts", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class MlDeleteForecastRequestDescriptor : RequestDescriptorBase<MlDeleteForecastRequestDescriptor, MlDeleteForecastRequestParameters>
@@ -73,7 +73,7 @@ internal MlDeleteForecastRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		public MlDeleteForecastRequestDescriptor AllowNoForecasts(bool? allowNoForecasts = true) => Qs("allow_no_forecasts", allowNoForecasts);
-		public MlDeleteForecastRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public MlDeleteForecastRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public MlDeleteForecastRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id job_id)
 		{
 			RouteValues.Required("job_id", job_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlFlushJobRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlFlushJobRequest.g.cs
index 315971be955..780926a8265 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlFlushJobRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlFlushJobRequest.g.cs
@@ -40,7 +40,7 @@ public MlFlushJobRequest(Elastic.Clients.Elasticsearch.Id job_id) : base(r => r.
 		protected override bool SupportsBody => true;
 		[JsonInclude]
 		[JsonPropertyName("advance_time")]
-		public string? AdvanceTime { get; set; }
+		public DateTimeOffset? AdvanceTime { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("calc_interim")]
@@ -48,15 +48,15 @@ public MlFlushJobRequest(Elastic.Clients.Elasticsearch.Id job_id) : base(r => r.
 
 		[JsonInclude]
 		[JsonPropertyName("end")]
-		public string? End { get; set; }
+		public DateTimeOffset? End { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("skip_time")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? SkipTime { get; set; }
+		public DateTimeOffset? SkipTime { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("start")]
-		public string? Start { get; set; }
+		public DateTimeOffset? Start { get; set; }
 	}
 
 	public sealed partial class MlFlushJobRequestDescriptor<TDocument> : RequestDescriptorBase<MlFlushJobRequestDescriptor<TDocument>, MlFlushJobRequestParameters>
@@ -79,17 +79,17 @@ public MlFlushJobRequestDescriptor<TDocument> JobId(Elastic.Clients.Elasticsearc
 			return Self;
 		}
 
-		private string? AdvanceTimeValue { get; set; }
+		private DateTimeOffset? AdvanceTimeValue { get; set; }
 
 		private bool? CalcInterimValue { get; set; }
 
-		private string? EndValue { get; set; }
+		private DateTimeOffset? EndValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.EpochMillis? SkipTimeValue { get; set; }
+		private DateTimeOffset? SkipTimeValue { get; set; }
 
-		private string? StartValue { get; set; }
+		private DateTimeOffset? StartValue { get; set; }
 
-		public MlFlushJobRequestDescriptor<TDocument> AdvanceTime(string? advanceTime)
+		public MlFlushJobRequestDescriptor<TDocument> AdvanceTime(DateTimeOffset? advanceTime)
 		{
 			AdvanceTimeValue = advanceTime;
 			return Self;
@@ -101,19 +101,19 @@ public MlFlushJobRequestDescriptor<TDocument> CalcInterim(bool? calcInterim = tr
 			return Self;
 		}
 
-		public MlFlushJobRequestDescriptor<TDocument> End(string? end)
+		public MlFlushJobRequestDescriptor<TDocument> End(DateTimeOffset? end)
 		{
 			EndValue = end;
 			return Self;
 		}
 
-		public MlFlushJobRequestDescriptor<TDocument> SkipTime(Elastic.Clients.Elasticsearch.EpochMillis? skipTime)
+		public MlFlushJobRequestDescriptor<TDocument> SkipTime(DateTimeOffset? skipTime)
 		{
 			SkipTimeValue = skipTime;
 			return Self;
 		}
 
-		public MlFlushJobRequestDescriptor<TDocument> Start(string? start)
+		public MlFlushJobRequestDescriptor<TDocument> Start(DateTimeOffset? start)
 		{
 			StartValue = start;
 			return Self;
@@ -176,17 +176,17 @@ public MlFlushJobRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id job_id
 			return Self;
 		}
 
-		private string? AdvanceTimeValue { get; set; }
+		private DateTimeOffset? AdvanceTimeValue { get; set; }
 
 		private bool? CalcInterimValue { get; set; }
 
-		private string? EndValue { get; set; }
+		private DateTimeOffset? EndValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.EpochMillis? SkipTimeValue { get; set; }
+		private DateTimeOffset? SkipTimeValue { get; set; }
 
-		private string? StartValue { get; set; }
+		private DateTimeOffset? StartValue { get; set; }
 
-		public MlFlushJobRequestDescriptor AdvanceTime(string? advanceTime)
+		public MlFlushJobRequestDescriptor AdvanceTime(DateTimeOffset? advanceTime)
 		{
 			AdvanceTimeValue = advanceTime;
 			return Self;
@@ -198,19 +198,19 @@ public MlFlushJobRequestDescriptor CalcInterim(bool? calcInterim = true)
 			return Self;
 		}
 
-		public MlFlushJobRequestDescriptor End(string? end)
+		public MlFlushJobRequestDescriptor End(DateTimeOffset? end)
 		{
 			EndValue = end;
 			return Self;
 		}
 
-		public MlFlushJobRequestDescriptor SkipTime(Elastic.Clients.Elasticsearch.EpochMillis? skipTime)
+		public MlFlushJobRequestDescriptor SkipTime(DateTimeOffset? skipTime)
 		{
 			SkipTimeValue = skipTime;
 			return Self;
 		}
 
-		public MlFlushJobRequestDescriptor Start(string? start)
+		public MlFlushJobRequestDescriptor Start(DateTimeOffset? start)
 		{
 			StartValue = start;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlForecastRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlForecastRequest.g.cs
index e7f5b550da8..8590094d90c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlForecastRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlForecastRequest.g.cs
@@ -40,11 +40,11 @@ public MlForecastRequest(Elastic.Clients.Elasticsearch.Id job_id) : base(r => r.
 		protected override bool SupportsBody => true;
 		[JsonInclude]
 		[JsonPropertyName("duration")]
-		public Elastic.Clients.Elasticsearch.Time? Duration { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Duration { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("expires_in")]
-		public Elastic.Clients.Elasticsearch.Time? ExpiresIn { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? ExpiresIn { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("max_model_memory")]
@@ -71,19 +71,19 @@ public MlForecastRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id job_id
 			return Self;
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? DurationValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? DurationValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? ExpiresInValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? ExpiresInValue { get; set; }
 
 		private string? MaxModelMemoryValue { get; set; }
 
-		public MlForecastRequestDescriptor Duration(Elastic.Clients.Elasticsearch.Time? duration)
+		public MlForecastRequestDescriptor Duration(Elastic.Clients.Elasticsearch.Duration? duration)
 		{
 			DurationValue = duration;
 			return Self;
 		}
 
-		public MlForecastRequestDescriptor ExpiresIn(Elastic.Clients.Elasticsearch.Time? expiresIn)
+		public MlForecastRequestDescriptor ExpiresIn(Elastic.Clients.Elasticsearch.Duration? expiresIn)
 		{
 			ExpiresInValue = expiresIn;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetCalendarEventsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetCalendarEventsRequest.g.cs
index 6fdc93c8783..d1e58a1eed3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetCalendarEventsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetCalendarEventsRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.Ml
 	public sealed class MlGetCalendarEventsRequestParameters : RequestParameters<MlGetCalendarEventsRequestParameters>
 	{
 		[JsonIgnore]
-		public string? End { get => Q<string?>("end"); set => Q("end", value); }
+		public DateTimeOffset? End { get => Q<DateTimeOffset?>("end"); set => Q("end", value); }
 
 		[JsonIgnore]
 		public int? From { get => Q<int?>("from"); set => Q("from", value); }
@@ -40,7 +40,7 @@ public sealed class MlGetCalendarEventsRequestParameters : RequestParameters<MlG
 		public int? Size { get => Q<int?>("size"); set => Q("size", value); }
 
 		[JsonIgnore]
-		public string? Start { get => Q<string?>("start"); set => Q("start", value); }
+		public DateTimeOffset? Start { get => Q<DateTimeOffset?>("start"); set => Q("start", value); }
 	}
 
 	public partial class MlGetCalendarEventsRequest : PlainRequestBase<MlGetCalendarEventsRequestParameters>
@@ -53,7 +53,7 @@ public MlGetCalendarEventsRequest(Elastic.Clients.Elasticsearch.Id calendar_id)
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public string? End { get => Q<string?>("end"); set => Q("end", value); }
+		public DateTimeOffset? End { get => Q<DateTimeOffset?>("end"); set => Q("end", value); }
 
 		[JsonIgnore]
 		public int? From { get => Q<int?>("from"); set => Q("from", value); }
@@ -65,7 +65,7 @@ public MlGetCalendarEventsRequest(Elastic.Clients.Elasticsearch.Id calendar_id)
 		public int? Size { get => Q<int?>("size"); set => Q("size", value); }
 
 		[JsonIgnore]
-		public string? Start { get => Q<string?>("start"); set => Q("start", value); }
+		public DateTimeOffset? Start { get => Q<DateTimeOffset?>("start"); set => Q("start", value); }
 	}
 
 	public sealed partial class MlGetCalendarEventsRequestDescriptor : RequestDescriptorBase<MlGetCalendarEventsRequestDescriptor, MlGetCalendarEventsRequestParameters>
@@ -82,11 +82,11 @@ internal MlGetCalendarEventsRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.MachineLearningGetCalendarEvents;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public MlGetCalendarEventsRequestDescriptor End(string? end) => Qs("end", end);
+		public MlGetCalendarEventsRequestDescriptor End(DateTimeOffset? end) => Qs("end", end);
 		public MlGetCalendarEventsRequestDescriptor From(int? from) => Qs("from", from);
 		public MlGetCalendarEventsRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id? jobId) => Qs("job_id", jobId);
 		public MlGetCalendarEventsRequestDescriptor Size(int? size) => Qs("size", size);
-		public MlGetCalendarEventsRequestDescriptor Start(string? start) => Qs("start", start);
+		public MlGetCalendarEventsRequestDescriptor Start(DateTimeOffset? start) => Qs("start", start);
 		public MlGetCalendarEventsRequestDescriptor CalendarId(Elastic.Clients.Elasticsearch.Id calendar_id)
 		{
 			RouteValues.Required("calendar_id", calendar_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetInfluencersRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetInfluencersRequest.g.cs
index 9e9f9541f15..677db7f2aa1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetInfluencersRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetInfluencersRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class MlGetInfluencersRequestParameters : RequestParameters<MlGetI
 		public bool? Desc { get => Q<bool?>("desc"); set => Q("desc", value); }
 
 		[JsonIgnore]
-		public string? End { get => Q<string?>("end"); set => Q("end", value); }
+		public DateTimeOffset? End { get => Q<DateTimeOffset?>("end"); set => Q("end", value); }
 
 		[JsonIgnore]
 		public bool? ExcludeInterim { get => Q<bool?>("exclude_interim"); set => Q("exclude_interim", value); }
@@ -49,7 +49,7 @@ public sealed class MlGetInfluencersRequestParameters : RequestParameters<MlGetI
 		public Elastic.Clients.Elasticsearch.Field? Sort { get => Q<Elastic.Clients.Elasticsearch.Field?>("sort"); set => Q("sort", value); }
 
 		[JsonIgnore]
-		public string? Start { get => Q<string?>("start"); set => Q("start", value); }
+		public DateTimeOffset? Start { get => Q<DateTimeOffset?>("start"); set => Q("start", value); }
 	}
 
 	public partial class MlGetInfluencersRequest : PlainRequestBase<MlGetInfluencersRequestParameters>
@@ -65,7 +65,7 @@ public MlGetInfluencersRequest(Elastic.Clients.Elasticsearch.Id job_id) : base(r
 		public bool? Desc { get => Q<bool?>("desc"); set => Q("desc", value); }
 
 		[JsonIgnore]
-		public string? End { get => Q<string?>("end"); set => Q("end", value); }
+		public DateTimeOffset? End { get => Q<DateTimeOffset?>("end"); set => Q("end", value); }
 
 		[JsonIgnore]
 		public bool? ExcludeInterim { get => Q<bool?>("exclude_interim"); set => Q("exclude_interim", value); }
@@ -83,7 +83,7 @@ public MlGetInfluencersRequest(Elastic.Clients.Elasticsearch.Id job_id) : base(r
 		public Elastic.Clients.Elasticsearch.Field? Sort { get => Q<Elastic.Clients.Elasticsearch.Field?>("sort"); set => Q("sort", value); }
 
 		[JsonIgnore]
-		public string? Start { get => Q<string?>("start"); set => Q("start", value); }
+		public DateTimeOffset? Start { get => Q<DateTimeOffset?>("start"); set => Q("start", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("page")]
@@ -105,13 +105,13 @@ internal MlGetInfluencersRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public MlGetInfluencersRequestDescriptor<TDocument> Desc(bool? desc = true) => Qs("desc", desc);
-		public MlGetInfluencersRequestDescriptor<TDocument> End(string? end) => Qs("end", end);
+		public MlGetInfluencersRequestDescriptor<TDocument> End(DateTimeOffset? end) => Qs("end", end);
 		public MlGetInfluencersRequestDescriptor<TDocument> ExcludeInterim(bool? excludeInterim = true) => Qs("exclude_interim", excludeInterim);
 		public MlGetInfluencersRequestDescriptor<TDocument> From(int? from) => Qs("from", from);
 		public MlGetInfluencersRequestDescriptor<TDocument> InfluencerScore(double? influencerScore) => Qs("influencer_score", influencerScore);
 		public MlGetInfluencersRequestDescriptor<TDocument> Size(int? size) => Qs("size", size);
 		public MlGetInfluencersRequestDescriptor<TDocument> Sort(Elastic.Clients.Elasticsearch.Field? sort) => Qs("sort", sort);
-		public MlGetInfluencersRequestDescriptor<TDocument> Start(string? start) => Qs("start", start);
+		public MlGetInfluencersRequestDescriptor<TDocument> Start(DateTimeOffset? start) => Qs("start", start);
 		public MlGetInfluencersRequestDescriptor<TDocument> JobId(Elastic.Clients.Elasticsearch.Id job_id)
 		{
 			RouteValues.Required("job_id", job_id);
@@ -186,13 +186,13 @@ internal MlGetInfluencersRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public MlGetInfluencersRequestDescriptor Desc(bool? desc = true) => Qs("desc", desc);
-		public MlGetInfluencersRequestDescriptor End(string? end) => Qs("end", end);
+		public MlGetInfluencersRequestDescriptor End(DateTimeOffset? end) => Qs("end", end);
 		public MlGetInfluencersRequestDescriptor ExcludeInterim(bool? excludeInterim = true) => Qs("exclude_interim", excludeInterim);
 		public MlGetInfluencersRequestDescriptor From(int? from) => Qs("from", from);
 		public MlGetInfluencersRequestDescriptor InfluencerScore(double? influencerScore) => Qs("influencer_score", influencerScore);
 		public MlGetInfluencersRequestDescriptor Size(int? size) => Qs("size", size);
 		public MlGetInfluencersRequestDescriptor Sort(Elastic.Clients.Elasticsearch.Field? sort) => Qs("sort", sort);
-		public MlGetInfluencersRequestDescriptor Start(string? start) => Qs("start", start);
+		public MlGetInfluencersRequestDescriptor Start(DateTimeOffset? start) => Qs("start", start);
 		public MlGetInfluencersRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id job_id)
 		{
 			RouteValues.Required("job_id", job_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetMemoryStatsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetMemoryStatsRequest.g.cs
index 1fb1655610c..fb293fa51e3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetMemoryStatsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetMemoryStatsRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Ml
 	public sealed class MlGetMemoryStatsRequestParameters : RequestParameters<MlGetMemoryStatsRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class MlGetMemoryStatsRequest : PlainRequestBase<MlGetMemoryStatsRequestParameters>
@@ -48,10 +48,10 @@ public MlGetMemoryStatsRequest(Elastic.Clients.Elasticsearch.Id? node_id) : base
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class MlGetMemoryStatsRequestDescriptor : RequestDescriptorBase<MlGetMemoryStatsRequestDescriptor, MlGetMemoryStatsRequestParameters>
@@ -64,8 +64,8 @@ public MlGetMemoryStatsRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.MachineLearningGetMemoryStats;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public MlGetMemoryStatsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public MlGetMemoryStatsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public MlGetMemoryStatsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public MlGetMemoryStatsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public MlGetMemoryStatsRequestDescriptor NodeId(Elastic.Clients.Elasticsearch.Id? node_id)
 		{
 			RouteValues.Optional("node_id", node_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetModelSnapshotsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetModelSnapshotsRequest.g.cs
index 1b203442445..98572fb330e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetModelSnapshotsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetModelSnapshotsRequest.g.cs
@@ -59,7 +59,7 @@ public MlGetModelSnapshotsRequest(Elastic.Clients.Elasticsearch.Id job_id) : bas
 
 		[JsonInclude]
 		[JsonPropertyName("end")]
-		public Elastic.Clients.Elasticsearch.Time? End { get; set; }
+		public DateTimeOffset? End { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("page")]
@@ -71,7 +71,7 @@ public MlGetModelSnapshotsRequest(Elastic.Clients.Elasticsearch.Id job_id) : bas
 
 		[JsonInclude]
 		[JsonPropertyName("start")]
-		public Elastic.Clients.Elasticsearch.Time? Start { get; set; }
+		public DateTimeOffset? Start { get; set; }
 	}
 
 	public sealed partial class MlGetModelSnapshotsRequestDescriptor<TDocument> : RequestDescriptorBase<MlGetModelSnapshotsRequestDescriptor<TDocument>, MlGetModelSnapshotsRequestParameters>
@@ -108,7 +108,7 @@ public MlGetModelSnapshotsRequestDescriptor<TDocument> SnapshotId(Elastic.Client
 
 		private bool? DescValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? EndValue { get; set; }
+		private DateTimeOffset? EndValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.Ml.Page? PageValue { get; set; }
 
@@ -118,7 +118,7 @@ public MlGetModelSnapshotsRequestDescriptor<TDocument> SnapshotId(Elastic.Client
 
 		private Elastic.Clients.Elasticsearch.Field? SortValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? StartValue { get; set; }
+		private DateTimeOffset? StartValue { get; set; }
 
 		public MlGetModelSnapshotsRequestDescriptor<TDocument> Desc(bool? desc = true)
 		{
@@ -126,7 +126,7 @@ public MlGetModelSnapshotsRequestDescriptor<TDocument> Desc(bool? desc = true)
 			return Self;
 		}
 
-		public MlGetModelSnapshotsRequestDescriptor<TDocument> End(Elastic.Clients.Elasticsearch.Time? end)
+		public MlGetModelSnapshotsRequestDescriptor<TDocument> End(DateTimeOffset? end)
 		{
 			EndValue = end;
 			return Self;
@@ -168,7 +168,7 @@ public MlGetModelSnapshotsRequestDescriptor<TDocument> Sort<TValue>(Expression<F
 			return Self;
 		}
 
-		public MlGetModelSnapshotsRequestDescriptor<TDocument> Start(Elastic.Clients.Elasticsearch.Time? start)
+		public MlGetModelSnapshotsRequestDescriptor<TDocument> Start(DateTimeOffset? start)
 		{
 			StartValue = start;
 			return Self;
@@ -255,7 +255,7 @@ public MlGetModelSnapshotsRequestDescriptor SnapshotId(Elastic.Clients.Elasticse
 
 		private bool? DescValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? EndValue { get; set; }
+		private DateTimeOffset? EndValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.Ml.Page? PageValue { get; set; }
 
@@ -265,7 +265,7 @@ public MlGetModelSnapshotsRequestDescriptor SnapshotId(Elastic.Clients.Elasticse
 
 		private Elastic.Clients.Elasticsearch.Field? SortValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? StartValue { get; set; }
+		private DateTimeOffset? StartValue { get; set; }
 
 		public MlGetModelSnapshotsRequestDescriptor Desc(bool? desc = true)
 		{
@@ -273,7 +273,7 @@ public MlGetModelSnapshotsRequestDescriptor Desc(bool? desc = true)
 			return Self;
 		}
 
-		public MlGetModelSnapshotsRequestDescriptor End(Elastic.Clients.Elasticsearch.Time? end)
+		public MlGetModelSnapshotsRequestDescriptor End(DateTimeOffset? end)
 		{
 			EndValue = end;
 			return Self;
@@ -321,7 +321,7 @@ public MlGetModelSnapshotsRequestDescriptor Sort<TDocument>(Expression<Func<TDoc
 			return Self;
 		}
 
-		public MlGetModelSnapshotsRequestDescriptor Start(Elastic.Clients.Elasticsearch.Time? start)
+		public MlGetModelSnapshotsRequestDescriptor Start(DateTimeOffset? start)
 		{
 			StartValue = start;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetOverallBucketsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetOverallBucketsRequest.g.cs
index ebc49eb032b..c62b3d840bc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetOverallBucketsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetOverallBucketsRequest.g.cs
@@ -44,11 +44,11 @@ public MlGetOverallBucketsRequest(Elastic.Clients.Elasticsearch.Id job_id) : bas
 
 		[JsonInclude]
 		[JsonPropertyName("bucket_span")]
-		public Elastic.Clients.Elasticsearch.Time? BucketSpan { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? BucketSpan { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("end")]
-		public Elastic.Clients.Elasticsearch.Time? End { get; set; }
+		public DateTimeOffset? End { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("exclude_interim")]
@@ -60,7 +60,7 @@ public MlGetOverallBucketsRequest(Elastic.Clients.Elasticsearch.Id job_id) : bas
 
 		[JsonInclude]
 		[JsonPropertyName("start")]
-		public Elastic.Clients.Elasticsearch.Time? Start { get; set; }
+		public DateTimeOffset? Start { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("top_n")]
@@ -89,15 +89,15 @@ public MlGetOverallBucketsRequestDescriptor JobId(Elastic.Clients.Elasticsearch.
 
 		private bool? AllowNoMatchValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? BucketSpanValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? BucketSpanValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? EndValue { get; set; }
+		private DateTimeOffset? EndValue { get; set; }
 
 		private bool? ExcludeInterimValue { get; set; }
 
 		private Union<double?, string?>? OverallScoreValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? StartValue { get; set; }
+		private DateTimeOffset? StartValue { get; set; }
 
 		private int? TopNValue { get; set; }
 
@@ -107,13 +107,13 @@ public MlGetOverallBucketsRequestDescriptor AllowNoMatch(bool? allowNoMatch = tr
 			return Self;
 		}
 
-		public MlGetOverallBucketsRequestDescriptor BucketSpan(Elastic.Clients.Elasticsearch.Time? bucketSpan)
+		public MlGetOverallBucketsRequestDescriptor BucketSpan(Elastic.Clients.Elasticsearch.Duration? bucketSpan)
 		{
 			BucketSpanValue = bucketSpan;
 			return Self;
 		}
 
-		public MlGetOverallBucketsRequestDescriptor End(Elastic.Clients.Elasticsearch.Time? end)
+		public MlGetOverallBucketsRequestDescriptor End(DateTimeOffset? end)
 		{
 			EndValue = end;
 			return Self;
@@ -131,7 +131,7 @@ public MlGetOverallBucketsRequestDescriptor OverallScore(Union<double?, string?>
 			return Self;
 		}
 
-		public MlGetOverallBucketsRequestDescriptor Start(Elastic.Clients.Elasticsearch.Time? start)
+		public MlGetOverallBucketsRequestDescriptor Start(DateTimeOffset? start)
 		{
 			StartValue = start;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetRecordsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetRecordsRequest.g.cs
index e75bde355a7..93738b62bc4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetRecordsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlGetRecordsRequest.g.cs
@@ -55,7 +55,7 @@ public MlGetRecordsRequest(Elastic.Clients.Elasticsearch.Id job_id) : base(r =>
 
 		[JsonInclude]
 		[JsonPropertyName("end")]
-		public string? End { get; set; }
+		public DateTimeOffset? End { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("exclude_interim")]
@@ -75,7 +75,7 @@ public MlGetRecordsRequest(Elastic.Clients.Elasticsearch.Id job_id) : base(r =>
 
 		[JsonInclude]
 		[JsonPropertyName("start")]
-		public string? Start { get; set; }
+		public DateTimeOffset? Start { get; set; }
 	}
 
 	public sealed partial class MlGetRecordsRequestDescriptor<TDocument> : RequestDescriptorBase<MlGetRecordsRequestDescriptor<TDocument>, MlGetRecordsRequestParameters>
@@ -102,7 +102,7 @@ public MlGetRecordsRequestDescriptor<TDocument> JobId(Elastic.Clients.Elasticsea
 
 		private bool? DescValue { get; set; }
 
-		private string? EndValue { get; set; }
+		private DateTimeOffset? EndValue { get; set; }
 
 		private bool? ExcludeInterimValue { get; set; }
 
@@ -116,7 +116,7 @@ public MlGetRecordsRequestDescriptor<TDocument> JobId(Elastic.Clients.Elasticsea
 
 		private Elastic.Clients.Elasticsearch.Field? SortValue { get; set; }
 
-		private string? StartValue { get; set; }
+		private DateTimeOffset? StartValue { get; set; }
 
 		public MlGetRecordsRequestDescriptor<TDocument> Desc(bool? desc = true)
 		{
@@ -124,7 +124,7 @@ public MlGetRecordsRequestDescriptor<TDocument> Desc(bool? desc = true)
 			return Self;
 		}
 
-		public MlGetRecordsRequestDescriptor<TDocument> End(string? end)
+		public MlGetRecordsRequestDescriptor<TDocument> End(DateTimeOffset? end)
 		{
 			EndValue = end;
 			return Self;
@@ -178,7 +178,7 @@ public MlGetRecordsRequestDescriptor<TDocument> Sort<TValue>(Expression<Func<TDo
 			return Self;
 		}
 
-		public MlGetRecordsRequestDescriptor<TDocument> Start(string? start)
+		public MlGetRecordsRequestDescriptor<TDocument> Start(DateTimeOffset? start)
 		{
 			StartValue = start;
 			return Self;
@@ -267,7 +267,7 @@ public MlGetRecordsRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id job_
 
 		private bool? DescValue { get; set; }
 
-		private string? EndValue { get; set; }
+		private DateTimeOffset? EndValue { get; set; }
 
 		private bool? ExcludeInterimValue { get; set; }
 
@@ -281,7 +281,7 @@ public MlGetRecordsRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id job_
 
 		private Elastic.Clients.Elasticsearch.Field? SortValue { get; set; }
 
-		private string? StartValue { get; set; }
+		private DateTimeOffset? StartValue { get; set; }
 
 		public MlGetRecordsRequestDescriptor Desc(bool? desc = true)
 		{
@@ -289,7 +289,7 @@ public MlGetRecordsRequestDescriptor Desc(bool? desc = true)
 			return Self;
 		}
 
-		public MlGetRecordsRequestDescriptor End(string? end)
+		public MlGetRecordsRequestDescriptor End(DateTimeOffset? end)
 		{
 			EndValue = end;
 			return Self;
@@ -349,7 +349,7 @@ public MlGetRecordsRequestDescriptor Sort<TDocument>(Expression<Func<TDocument,
 			return Self;
 		}
 
-		public MlGetRecordsRequestDescriptor Start(string? start)
+		public MlGetRecordsRequestDescriptor Start(DateTimeOffset? start)
 		{
 			StartValue = start;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlOpenJobRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlOpenJobRequest.g.cs
index a6a44a6b945..783726f5095 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlOpenJobRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlOpenJobRequest.g.cs
@@ -40,7 +40,7 @@ public MlOpenJobRequest(Elastic.Clients.Elasticsearch.Id job_id) : base(r => r.R
 		protected override bool SupportsBody => true;
 		[JsonInclude]
 		[JsonPropertyName("timeout")]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get; set; }
 	}
 
 	public sealed partial class MlOpenJobRequestDescriptor : RequestDescriptorBase<MlOpenJobRequestDescriptor, MlOpenJobRequestParameters>
@@ -63,9 +63,9 @@ public MlOpenJobRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id job_id)
 			return Self;
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? TimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; }
 
-		public MlOpenJobRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout)
+		public MlOpenJobRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout)
 		{
 			TimeoutValue = timeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutDatafeedRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutDatafeedRequest.g.cs
index fbec5f5b4a1..ee2941c7fd8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutDatafeedRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutDatafeedRequest.g.cs
@@ -75,7 +75,7 @@ public MlPutDatafeedRequest(Elastic.Clients.Elasticsearch.Id datafeed_id) : base
 
 		[JsonInclude]
 		[JsonPropertyName("frequency")]
-		public Elastic.Clients.Elasticsearch.Time? Frequency { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Frequency { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("indices")]
@@ -99,7 +99,7 @@ public MlPutDatafeedRequest(Elastic.Clients.Elasticsearch.Id datafeed_id) : base
 
 		[JsonInclude]
 		[JsonPropertyName("query_delay")]
-		public Elastic.Clients.Elasticsearch.Time? QueryDelay { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? QueryDelay { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("runtime_mappings")]
@@ -162,7 +162,7 @@ public MlPutDatafeedRequestDescriptor<TDocument> DatafeedId(Elastic.Clients.Elas
 
 		private Action<DelayedDataCheckConfigDescriptor> DelayedDataCheckConfigDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private Dictionary<string, IEnumerable<string>>? HeadersValue { get; set; }
 
@@ -178,7 +178,7 @@ public MlPutDatafeedRequestDescriptor<TDocument> DatafeedId(Elastic.Clients.Elas
 
 		private int? MaxEmptySearchesValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? QueryDelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? QueryDelayValue { get; set; }
 
 		private Dictionary<Elastic.Clients.Elasticsearch.Field, IEnumerable<Elastic.Clients.Elasticsearch.Mapping.RuntimeField>>? RuntimeMappingsValue { get; set; }
 
@@ -264,7 +264,7 @@ public MlPutDatafeedRequestDescriptor<TDocument> DelayedDataCheckConfig(Action<D
 			return Self;
 		}
 
-		public MlPutDatafeedRequestDescriptor<TDocument> Frequency(Elastic.Clients.Elasticsearch.Time? frequency)
+		public MlPutDatafeedRequestDescriptor<TDocument> Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
@@ -318,7 +318,7 @@ public MlPutDatafeedRequestDescriptor<TDocument> MaxEmptySearches(int? maxEmptyS
 			return Self;
 		}
 
-		public MlPutDatafeedRequestDescriptor<TDocument> QueryDelay(Elastic.Clients.Elasticsearch.Time? queryDelay)
+		public MlPutDatafeedRequestDescriptor<TDocument> QueryDelay(Elastic.Clients.Elasticsearch.Duration? queryDelay)
 		{
 			QueryDelayValue = queryDelay;
 			return Self;
@@ -517,7 +517,7 @@ public MlPutDatafeedRequestDescriptor DatafeedId(Elastic.Clients.Elasticsearch.I
 
 		private Action<DelayedDataCheckConfigDescriptor> DelayedDataCheckConfigDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private Dictionary<string, IEnumerable<string>>? HeadersValue { get; set; }
 
@@ -533,7 +533,7 @@ public MlPutDatafeedRequestDescriptor DatafeedId(Elastic.Clients.Elasticsearch.I
 
 		private int? MaxEmptySearchesValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? QueryDelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? QueryDelayValue { get; set; }
 
 		private Dictionary<Elastic.Clients.Elasticsearch.Field, IEnumerable<Elastic.Clients.Elasticsearch.Mapping.RuntimeField>>? RuntimeMappingsValue { get; set; }
 
@@ -619,7 +619,7 @@ public MlPutDatafeedRequestDescriptor DelayedDataCheckConfig(Action<DelayedDataC
 			return Self;
 		}
 
-		public MlPutDatafeedRequestDescriptor Frequency(Elastic.Clients.Elasticsearch.Time? frequency)
+		public MlPutDatafeedRequestDescriptor Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
@@ -673,7 +673,7 @@ public MlPutDatafeedRequestDescriptor MaxEmptySearches(int? maxEmptySearches)
 			return Self;
 		}
 
-		public MlPutDatafeedRequestDescriptor QueryDelay(Elastic.Clients.Elasticsearch.Time? queryDelay)
+		public MlPutDatafeedRequestDescriptor QueryDelay(Elastic.Clients.Elasticsearch.Duration? queryDelay)
 		{
 			QueryDelayValue = queryDelay;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutDatafeedResponse.g.cs
index 9feeb4d33ca..a46f3e8db0c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutDatafeedResponse.g.cs
@@ -42,7 +42,7 @@ public sealed partial class MlPutDatafeedResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("frequency")]
-		public Elastic.Clients.Elasticsearch.Time Frequency { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration Frequency { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("indices")]
@@ -66,7 +66,7 @@ public sealed partial class MlPutDatafeedResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("query_delay")]
-		public Elastic.Clients.Elasticsearch.Time QueryDelay { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration QueryDelay { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("runtime_mappings")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutJobRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutJobRequest.g.cs
index 1b5209204ae..94e39382427 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutJobRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutJobRequest.g.cs
@@ -52,7 +52,7 @@ public MlPutJobRequest(Elastic.Clients.Elasticsearch.Id job_id) : base(r => r.Re
 
 		[JsonInclude]
 		[JsonPropertyName("background_persist_interval")]
-		public Elastic.Clients.Elasticsearch.Time BackgroundPersistInterval { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? BackgroundPersistInterval { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("custom_settings")]
@@ -151,7 +151,7 @@ public MlPutJobRequestDescriptor<TDocument> JobId(Elastic.Clients.Elasticsearch.
 
 		private Action<AnalysisLimitsDescriptor> AnalysisLimitsDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time BackgroundPersistIntervalValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? BackgroundPersistIntervalValue { get; set; }
 
 		private object? CustomSettingsValue { get; set; }
 
@@ -295,7 +295,7 @@ public MlPutJobRequestDescriptor<TDocument> AnalysisLimits(Action<AnalysisLimits
 			return Self;
 		}
 
-		public MlPutJobRequestDescriptor<TDocument> BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Time backgroundPersistInterval)
+		public MlPutJobRequestDescriptor<TDocument> BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Duration? backgroundPersistInterval)
 		{
 			BackgroundPersistIntervalValue = backgroundPersistInterval;
 			return Self;
@@ -438,8 +438,12 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				JsonSerializer.Serialize(writer, AnalysisLimitsValue, options);
 			}
 
-			writer.WritePropertyName("background_persist_interval");
-			JsonSerializer.Serialize(writer, BackgroundPersistIntervalValue, options);
+			if (BackgroundPersistIntervalValue is not null)
+			{
+				writer.WritePropertyName("background_persist_interval");
+				JsonSerializer.Serialize(writer, BackgroundPersistIntervalValue, options);
+			}
+
 			if (CustomSettingsValue is not null)
 			{
 				writer.WritePropertyName("custom_settings");
@@ -544,7 +548,7 @@ public MlPutJobRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id job_id)
 
 		private Action<AnalysisLimitsDescriptor> AnalysisLimitsDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time BackgroundPersistIntervalValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? BackgroundPersistIntervalValue { get; set; }
 
 		private object? CustomSettingsValue { get; set; }
 
@@ -688,7 +692,7 @@ public MlPutJobRequestDescriptor AnalysisLimits(Action<AnalysisLimitsDescriptor>
 			return Self;
 		}
 
-		public MlPutJobRequestDescriptor BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Time backgroundPersistInterval)
+		public MlPutJobRequestDescriptor BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Duration? backgroundPersistInterval)
 		{
 			BackgroundPersistIntervalValue = backgroundPersistInterval;
 			return Self;
@@ -831,8 +835,12 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				JsonSerializer.Serialize(writer, AnalysisLimitsValue, options);
 			}
 
-			writer.WritePropertyName("background_persist_interval");
-			JsonSerializer.Serialize(writer, BackgroundPersistIntervalValue, options);
+			if (BackgroundPersistIntervalValue is not null)
+			{
+				writer.WritePropertyName("background_persist_interval");
+				JsonSerializer.Serialize(writer, BackgroundPersistIntervalValue, options);
+			}
+
 			if (CustomSettingsValue is not null)
 			{
 				writer.WritePropertyName("custom_settings");
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutJobResponse.g.cs
index c96131776ac..981914d5477 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutJobResponse.g.cs
@@ -16,6 +16,7 @@
 // ------------------------------------------------
 
 using Elastic.Transport.Products.Elasticsearch;
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -38,11 +39,11 @@ public sealed partial class MlPutJobResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("background_persist_interval")]
-		public Elastic.Clients.Elasticsearch.Time? BackgroundPersistInterval { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? BackgroundPersistInterval { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("create_time")]
-		public string CreateTime { get; init; }
+		public DateTimeOffset CreateTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("custom_settings")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutTrainedModelResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutTrainedModelResponse.g.cs
index a626ea11a8f..f174a229082 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutTrainedModelResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlPutTrainedModelResponse.g.cs
@@ -16,6 +16,7 @@
 // ------------------------------------------------
 
 using Elastic.Transport.Products.Elasticsearch;
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
@@ -34,7 +35,7 @@ public sealed partial class MlPutTrainedModelResponse : ElasticsearchResponseBas
 
 		[JsonInclude]
 		[JsonPropertyName("create_time")]
-		public Elastic.Clients.Elasticsearch.Time? CreateTime { get; init; }
+		public DateTimeOffset? CreateTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("default_field_map")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlSetUpgradeModeRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlSetUpgradeModeRequest.g.cs
index ee2a2a9edea..d820948f736 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlSetUpgradeModeRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlSetUpgradeModeRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class MlSetUpgradeModeRequestParameters : RequestParameters<MlSetU
 		public bool? Enabled { get => Q<bool?>("enabled"); set => Q("enabled", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class MlSetUpgradeModeRequest : PlainRequestBase<MlSetUpgradeModeRequestParameters>
@@ -43,7 +43,7 @@ public partial class MlSetUpgradeModeRequest : PlainRequestBase<MlSetUpgradeMode
 		public bool? Enabled { get => Q<bool?>("enabled"); set => Q("enabled", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class MlSetUpgradeModeRequestDescriptor : RequestDescriptorBase<MlSetUpgradeModeRequestDescriptor, MlSetUpgradeModeRequestParameters>
@@ -57,7 +57,7 @@ public MlSetUpgradeModeRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		public MlSetUpgradeModeRequestDescriptor Enabled(bool? enabled = true) => Qs("enabled", enabled);
-		public MlSetUpgradeModeRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public MlSetUpgradeModeRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 		}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStartDataFrameAnalyticsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStartDataFrameAnalyticsRequest.g.cs
index f6728de41b0..758f08e4237 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStartDataFrameAnalyticsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStartDataFrameAnalyticsRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.Ml
 	public sealed class MlStartDataFrameAnalyticsRequestParameters : RequestParameters<MlStartDataFrameAnalyticsRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class MlStartDataFrameAnalyticsRequest : PlainRequestBase<MlStartDataFrameAnalyticsRequestParameters>
@@ -41,7 +41,7 @@ public MlStartDataFrameAnalyticsRequest(Elastic.Clients.Elasticsearch.Id id) : b
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class MlStartDataFrameAnalyticsRequestDescriptor<TDocument> : RequestDescriptorBase<MlStartDataFrameAnalyticsRequestDescriptor<TDocument>, MlStartDataFrameAnalyticsRequestParameters>
@@ -58,7 +58,7 @@ internal MlStartDataFrameAnalyticsRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.MachineLearningStartDataFrameAnalytics;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
-		public MlStartDataFrameAnalyticsRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public MlStartDataFrameAnalyticsRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public MlStartDataFrameAnalyticsRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
@@ -84,7 +84,7 @@ internal MlStartDataFrameAnalyticsRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.MachineLearningStartDataFrameAnalytics;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
-		public MlStartDataFrameAnalyticsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public MlStartDataFrameAnalyticsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public MlStartDataFrameAnalyticsRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStartDatafeedRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStartDatafeedRequest.g.cs
index 3c3f663ec67..40ed226a407 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStartDatafeedRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStartDatafeedRequest.g.cs
@@ -40,15 +40,15 @@ public MlStartDatafeedRequest(Elastic.Clients.Elasticsearch.Id datafeed_id) : ba
 		protected override bool SupportsBody => true;
 		[JsonInclude]
 		[JsonPropertyName("end")]
-		public Elastic.Clients.Elasticsearch.Time? End { get; set; }
+		public DateTimeOffset? End { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("start")]
-		public Elastic.Clients.Elasticsearch.Time? Start { get; set; }
+		public DateTimeOffset? Start { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("timeout")]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get; set; }
 	}
 
 	public sealed partial class MlStartDatafeedRequestDescriptor : RequestDescriptorBase<MlStartDatafeedRequestDescriptor, MlStartDatafeedRequestParameters>
@@ -71,25 +71,25 @@ public MlStartDatafeedRequestDescriptor DatafeedId(Elastic.Clients.Elasticsearch
 			return Self;
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? EndValue { get; set; }
+		private DateTimeOffset? EndValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? StartValue { get; set; }
+		private DateTimeOffset? StartValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? TimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; }
 
-		public MlStartDatafeedRequestDescriptor End(Elastic.Clients.Elasticsearch.Time? end)
+		public MlStartDatafeedRequestDescriptor End(DateTimeOffset? end)
 		{
 			EndValue = end;
 			return Self;
 		}
 
-		public MlStartDatafeedRequestDescriptor Start(Elastic.Clients.Elasticsearch.Time? start)
+		public MlStartDatafeedRequestDescriptor Start(DateTimeOffset? start)
 		{
 			StartValue = start;
 			return Self;
 		}
 
-		public MlStartDatafeedRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout)
+		public MlStartDatafeedRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout)
 		{
 			TimeoutValue = timeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStopDataFrameAnalyticsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStopDataFrameAnalyticsRequest.g.cs
index a16cf4aee17..aaf9f93124e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStopDataFrameAnalyticsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStopDataFrameAnalyticsRequest.g.cs
@@ -34,7 +34,7 @@ public sealed class MlStopDataFrameAnalyticsRequestParameters : RequestParameter
 		public bool? Force { get => Q<bool?>("force"); set => Q("force", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class MlStopDataFrameAnalyticsRequest : PlainRequestBase<MlStopDataFrameAnalyticsRequestParameters>
@@ -53,7 +53,7 @@ public MlStopDataFrameAnalyticsRequest(Elastic.Clients.Elasticsearch.Id id) : ba
 		public bool? Force { get => Q<bool?>("force"); set => Q("force", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class MlStopDataFrameAnalyticsRequestDescriptor<TDocument> : RequestDescriptorBase<MlStopDataFrameAnalyticsRequestDescriptor<TDocument>, MlStopDataFrameAnalyticsRequestParameters>
@@ -72,7 +72,7 @@ internal MlStopDataFrameAnalyticsRequestDescriptor()
 		protected override bool SupportsBody => false;
 		public MlStopDataFrameAnalyticsRequestDescriptor<TDocument> AllowNoMatch(bool? allowNoMatch = true) => Qs("allow_no_match", allowNoMatch);
 		public MlStopDataFrameAnalyticsRequestDescriptor<TDocument> Force(bool? force = true) => Qs("force", force);
-		public MlStopDataFrameAnalyticsRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public MlStopDataFrameAnalyticsRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public MlStopDataFrameAnalyticsRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
@@ -100,7 +100,7 @@ internal MlStopDataFrameAnalyticsRequestDescriptor()
 		protected override bool SupportsBody => false;
 		public MlStopDataFrameAnalyticsRequestDescriptor AllowNoMatch(bool? allowNoMatch = true) => Qs("allow_no_match", allowNoMatch);
 		public MlStopDataFrameAnalyticsRequestDescriptor Force(bool? force = true) => Qs("force", force);
-		public MlStopDataFrameAnalyticsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public MlStopDataFrameAnalyticsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public MlStopDataFrameAnalyticsRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStopDatafeedRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStopDatafeedRequest.g.cs
index cef44f3558d..cb2d8a0cef8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStopDatafeedRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlStopDatafeedRequest.g.cs
@@ -48,7 +48,7 @@ public MlStopDatafeedRequest(Elastic.Clients.Elasticsearch.Id datafeed_id) : bas
 
 		[JsonInclude]
 		[JsonPropertyName("timeout")]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get; set; }
 	}
 
 	public sealed partial class MlStopDatafeedRequestDescriptor : RequestDescriptorBase<MlStopDatafeedRequestDescriptor, MlStopDatafeedRequestParameters>
@@ -75,7 +75,7 @@ public MlStopDatafeedRequestDescriptor DatafeedId(Elastic.Clients.Elasticsearch.
 
 		private bool? ForceValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? TimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; }
 
 		public MlStopDatafeedRequestDescriptor AllowNoMatch(bool? allowNoMatch = true)
 		{
@@ -89,7 +89,7 @@ public MlStopDatafeedRequestDescriptor Force(bool? force = true)
 			return Self;
 		}
 
-		public MlStopDatafeedRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout)
+		public MlStopDatafeedRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout)
 		{
 			TimeoutValue = timeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateDatafeedRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateDatafeedRequest.g.cs
index 486024bd7b4..86938a7c7e2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateDatafeedRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateDatafeedRequest.g.cs
@@ -75,7 +75,7 @@ public MlUpdateDatafeedRequest(Elastic.Clients.Elasticsearch.Id datafeed_id) : b
 
 		[JsonInclude]
 		[JsonPropertyName("frequency")]
-		public Elastic.Clients.Elasticsearch.Time? Frequency { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Frequency { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("indices")]
@@ -95,7 +95,7 @@ public MlUpdateDatafeedRequest(Elastic.Clients.Elasticsearch.Id datafeed_id) : b
 
 		[JsonInclude]
 		[JsonPropertyName("query_delay")]
-		public Elastic.Clients.Elasticsearch.Time? QueryDelay { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? QueryDelay { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("runtime_mappings")]
@@ -154,7 +154,7 @@ public MlUpdateDatafeedRequestDescriptor<TDocument> DatafeedId(Elastic.Clients.E
 
 		private Action<DelayedDataCheckConfigDescriptor> DelayedDataCheckConfigDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private IEnumerable<string>? IndicesValue { get; set; }
 
@@ -166,7 +166,7 @@ public MlUpdateDatafeedRequestDescriptor<TDocument> DatafeedId(Elastic.Clients.E
 
 		private int? MaxEmptySearchesValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? QueryDelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? QueryDelayValue { get; set; }
 
 		private Dictionary<Elastic.Clients.Elasticsearch.Field, IEnumerable<Elastic.Clients.Elasticsearch.Mapping.RuntimeField>>? RuntimeMappingsValue { get; set; }
 
@@ -252,7 +252,7 @@ public MlUpdateDatafeedRequestDescriptor<TDocument> DelayedDataCheckConfig(Actio
 			return Self;
 		}
 
-		public MlUpdateDatafeedRequestDescriptor<TDocument> Frequency(Elastic.Clients.Elasticsearch.Time? frequency)
+		public MlUpdateDatafeedRequestDescriptor<TDocument> Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
@@ -294,7 +294,7 @@ public MlUpdateDatafeedRequestDescriptor<TDocument> MaxEmptySearches(int? maxEmp
 			return Self;
 		}
 
-		public MlUpdateDatafeedRequestDescriptor<TDocument> QueryDelay(Elastic.Clients.Elasticsearch.Time? queryDelay)
+		public MlUpdateDatafeedRequestDescriptor<TDocument> QueryDelay(Elastic.Clients.Elasticsearch.Duration? queryDelay)
 		{
 			QueryDelayValue = queryDelay;
 			return Self;
@@ -481,7 +481,7 @@ public MlUpdateDatafeedRequestDescriptor DatafeedId(Elastic.Clients.Elasticsearc
 
 		private Action<DelayedDataCheckConfigDescriptor> DelayedDataCheckConfigDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private IEnumerable<string>? IndicesValue { get; set; }
 
@@ -493,7 +493,7 @@ public MlUpdateDatafeedRequestDescriptor DatafeedId(Elastic.Clients.Elasticsearc
 
 		private int? MaxEmptySearchesValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? QueryDelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? QueryDelayValue { get; set; }
 
 		private Dictionary<Elastic.Clients.Elasticsearch.Field, IEnumerable<Elastic.Clients.Elasticsearch.Mapping.RuntimeField>>? RuntimeMappingsValue { get; set; }
 
@@ -579,7 +579,7 @@ public MlUpdateDatafeedRequestDescriptor DelayedDataCheckConfig(Action<DelayedDa
 			return Self;
 		}
 
-		public MlUpdateDatafeedRequestDescriptor Frequency(Elastic.Clients.Elasticsearch.Time? frequency)
+		public MlUpdateDatafeedRequestDescriptor Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
@@ -621,7 +621,7 @@ public MlUpdateDatafeedRequestDescriptor MaxEmptySearches(int? maxEmptySearches)
 			return Self;
 		}
 
-		public MlUpdateDatafeedRequestDescriptor QueryDelay(Elastic.Clients.Elasticsearch.Time? queryDelay)
+		public MlUpdateDatafeedRequestDescriptor QueryDelay(Elastic.Clients.Elasticsearch.Duration? queryDelay)
 		{
 			QueryDelayValue = queryDelay;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateDatafeedResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateDatafeedResponse.g.cs
index 5e46a437a04..df4f9fa85fb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateDatafeedResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateDatafeedResponse.g.cs
@@ -42,7 +42,7 @@ public sealed partial class MlUpdateDatafeedResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("frequency")]
-		public Elastic.Clients.Elasticsearch.Time Frequency { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration Frequency { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("indices")]
@@ -66,7 +66,7 @@ public sealed partial class MlUpdateDatafeedResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("query_delay")]
-		public Elastic.Clients.Elasticsearch.Time QueryDelay { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration QueryDelay { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("runtime_mappings")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateJobRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateJobRequest.g.cs
index 3b01df9ca03..25c5c5f48dd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateJobRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateJobRequest.g.cs
@@ -48,7 +48,7 @@ public MlUpdateJobRequest(Elastic.Clients.Elasticsearch.Id job_id) : base(r => r
 
 		[JsonInclude]
 		[JsonPropertyName("background_persist_interval")]
-		public Elastic.Clients.Elasticsearch.Time? BackgroundPersistInterval { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? BackgroundPersistInterval { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("custom_settings")]
@@ -137,7 +137,7 @@ public MlUpdateJobRequestDescriptor<TDocument> JobId(Elastic.Clients.Elasticsear
 
 		private Action<AnalysisMemoryLimitDescriptor> AnalysisLimitsDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? BackgroundPersistIntervalValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? BackgroundPersistIntervalValue { get; set; }
 
 		private IEnumerable<string>? CategorizationFiltersValue { get; set; }
 
@@ -251,7 +251,7 @@ public MlUpdateJobRequestDescriptor<TDocument> AnalysisLimits(Action<AnalysisMem
 			return Self;
 		}
 
-		public MlUpdateJobRequestDescriptor<TDocument> BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Time? backgroundPersistInterval)
+		public MlUpdateJobRequestDescriptor<TDocument> BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Duration? backgroundPersistInterval)
 		{
 			BackgroundPersistIntervalValue = backgroundPersistInterval;
 			return Self;
@@ -513,7 +513,7 @@ public MlUpdateJobRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id job_i
 
 		private Action<AnalysisMemoryLimitDescriptor> AnalysisLimitsDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? BackgroundPersistIntervalValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? BackgroundPersistIntervalValue { get; set; }
 
 		private IEnumerable<string>? CategorizationFiltersValue { get; set; }
 
@@ -627,7 +627,7 @@ public MlUpdateJobRequestDescriptor AnalysisLimits(Action<AnalysisMemoryLimitDes
 			return Self;
 		}
 
-		public MlUpdateJobRequestDescriptor BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Time? backgroundPersistInterval)
+		public MlUpdateJobRequestDescriptor BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Duration? backgroundPersistInterval)
 		{
 			BackgroundPersistIntervalValue = backgroundPersistInterval;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateJobResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateJobResponse.g.cs
index d25fa39ab95..f51f071cc4e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateJobResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpdateJobResponse.g.cs
@@ -38,11 +38,11 @@ public sealed partial class MlUpdateJobResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("background_persist_interval")]
-		public Elastic.Clients.Elasticsearch.Time? BackgroundPersistInterval { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? BackgroundPersistInterval { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("create_time")]
-		public Elastic.Clients.Elasticsearch.EpochMillis CreateTime { get; init; }
+		public long CreateTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("custom_settings")]
@@ -66,7 +66,7 @@ public sealed partial class MlUpdateJobResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("finished_time")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? FinishedTime { get; init; }
+		public long? FinishedTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("groups")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpgradeJobSnapshotRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpgradeJobSnapshotRequest.g.cs
index 80e1bcc5811..8625151670a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpgradeJobSnapshotRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ml/MlUpgradeJobSnapshotRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class MlUpgradeJobSnapshotRequestParameters : RequestParameters<Ml
 		public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class MlUpgradeJobSnapshotRequest : PlainRequestBase<MlUpgradeJobSnapshotRequestParameters>
@@ -47,7 +47,7 @@ public MlUpgradeJobSnapshotRequest(Elastic.Clients.Elasticsearch.Id job_id, Elas
 		public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class MlUpgradeJobSnapshotRequestDescriptor : RequestDescriptorBase<MlUpgradeJobSnapshotRequestDescriptor, MlUpgradeJobSnapshotRequestParameters>
@@ -64,7 +64,7 @@ internal MlUpgradeJobSnapshotRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.MachineLearningUpgradeJobSnapshot;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
-		public MlUpgradeJobSnapshotRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public MlUpgradeJobSnapshotRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public MlUpgradeJobSnapshotRequestDescriptor WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
 		public MlUpgradeJobSnapshotRequestDescriptor JobId(Elastic.Clients.Elasticsearch.Id job_id)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesHotThreadsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesHotThreadsRequest.g.cs
index b4b19129e98..aeaddd19bb7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesHotThreadsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesHotThreadsRequest.g.cs
@@ -31,19 +31,19 @@ public sealed class NodesHotThreadsRequestParameters : RequestParameters<NodesHo
 		public bool? IgnoreIdleThreads { get => Q<bool?>("ignore_idle_threads"); set => Q("ignore_idle_threads", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Interval { get => Q<Elastic.Clients.Elasticsearch.Time?>("interval"); set => Q("interval", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Interval { get => Q<Elastic.Clients.Elasticsearch.Duration?>("interval"); set => Q("interval", value); }
 
 		[JsonIgnore]
 		public long? Snapshots { get => Q<long?>("snapshots"); set => Q("snapshots", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public long? Threads { get => Q<long?>("threads"); set => Q("threads", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.ThreadType? Type { get => Q<Elastic.Clients.Elasticsearch.ThreadType?>("type"); set => Q("type", value); }
@@ -69,19 +69,19 @@ public NodesHotThreadsRequest(Elastic.Clients.Elasticsearch.NodeIds? node_id) :
 		public bool? IgnoreIdleThreads { get => Q<bool?>("ignore_idle_threads"); set => Q("ignore_idle_threads", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Interval { get => Q<Elastic.Clients.Elasticsearch.Time?>("interval"); set => Q("interval", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Interval { get => Q<Elastic.Clients.Elasticsearch.Duration?>("interval"); set => Q("interval", value); }
 
 		[JsonIgnore]
 		public long? Snapshots { get => Q<long?>("snapshots"); set => Q("snapshots", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public long? Threads { get => Q<long?>("threads"); set => Q("threads", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.ThreadType? Type { get => Q<Elastic.Clients.Elasticsearch.ThreadType?>("type"); set => Q("type", value); }
@@ -101,12 +101,12 @@ public NodesHotThreadsRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		public NodesHotThreadsRequestDescriptor IgnoreIdleThreads(bool? ignoreIdleThreads = true) => Qs("ignore_idle_threads", ignoreIdleThreads);
-		public NodesHotThreadsRequestDescriptor Interval(Elastic.Clients.Elasticsearch.Time? interval) => Qs("interval", interval);
-		public NodesHotThreadsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public NodesHotThreadsRequestDescriptor Interval(Elastic.Clients.Elasticsearch.Duration? interval) => Qs("interval", interval);
+		public NodesHotThreadsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public NodesHotThreadsRequestDescriptor Snapshots(long? snapshots) => Qs("snapshots", snapshots);
 		public NodesHotThreadsRequestDescriptor Sort(Elastic.Clients.Elasticsearch.ThreadType? sort) => Qs("sort", sort);
 		public NodesHotThreadsRequestDescriptor Threads(long? threads) => Qs("threads", threads);
-		public NodesHotThreadsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public NodesHotThreadsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public NodesHotThreadsRequestDescriptor Type(Elastic.Clients.Elasticsearch.ThreadType? type) => Qs("type", type);
 		public NodesHotThreadsRequestDescriptor NodeId(Elastic.Clients.Elasticsearch.NodeIds? node_id)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesInfoRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesInfoRequest.g.cs
index b00ed15bfc1..3b81cd32253 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesInfoRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesInfoRequest.g.cs
@@ -31,10 +31,10 @@ public sealed class NodesInfoRequestParameters : RequestParameters<NodesInfoRequ
 		public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class NodesInfoRequest : PlainRequestBase<NodesInfoRequestParameters>
@@ -62,10 +62,10 @@ public NodesInfoRequest(Elastic.Clients.Elasticsearch.NodeIds? node_id, Elastic.
 		public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class NodesInfoRequestDescriptor : RequestDescriptorBase<NodesInfoRequestDescriptor, NodesInfoRequestParameters>
@@ -87,8 +87,8 @@ public NodesInfoRequestDescriptor(Elastic.Clients.Elasticsearch.NodeIds? node_id
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		public NodesInfoRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
-		public NodesInfoRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public NodesInfoRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public NodesInfoRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public NodesInfoRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public NodesInfoRequestDescriptor NodeId(Elastic.Clients.Elasticsearch.NodeIds? node_id)
 		{
 			RouteValues.Optional("node_id", node_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesReloadSecureSettingsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesReloadSecureSettingsRequest.g.cs
index e1d816dd8c0..47765a00389 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesReloadSecureSettingsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesReloadSecureSettingsRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.Nodes
 	public sealed class NodesReloadSecureSettingsRequestParameters : RequestParameters<NodesReloadSecureSettingsRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class NodesReloadSecureSettingsRequest : PlainRequestBase<NodesReloadSecureSettingsRequestParameters>
@@ -45,7 +45,7 @@ public NodesReloadSecureSettingsRequest(Elastic.Clients.Elasticsearch.NodeIds? n
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("secure_settings_password")]
@@ -62,7 +62,7 @@ public NodesReloadSecureSettingsRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.NodesReloadSecureSettings;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
-		public NodesReloadSecureSettingsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public NodesReloadSecureSettingsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public NodesReloadSecureSettingsRequestDescriptor NodeId(Elastic.Clients.Elasticsearch.NodeIds? node_id)
 		{
 			RouteValues.Optional("node_id", node_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesStatsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesStatsRequest.g.cs
index bd2cdcf0a1e..2d88a40bdb2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesStatsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesStatsRequest.g.cs
@@ -46,10 +46,10 @@ public sealed class NodesStatsRequestParameters : RequestParameters<NodesStatsRe
 		public Elastic.Clients.Elasticsearch.Level? Level { get => Q<Elastic.Clients.Elasticsearch.Level?>("level"); set => Q("level", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public IEnumerable<string>? Types { get => Q<IEnumerable<string>?>("types"); set => Q("types", value); }
@@ -106,10 +106,10 @@ public NodesStatsRequest(Elastic.Clients.Elasticsearch.NodeIds? node_id, Elastic
 		public Elastic.Clients.Elasticsearch.Level? Level { get => Q<Elastic.Clients.Elasticsearch.Level?>("level"); set => Q("level", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public IEnumerable<string>? Types { get => Q<IEnumerable<string>?>("types"); set => Q("types", value); }
@@ -151,8 +151,8 @@ public NodesStatsRequestDescriptor(Elastic.Clients.Elasticsearch.NodeIds? node_i
 		public NodesStatsRequestDescriptor<TDocument> IncludeSegmentFileSizes(bool? includeSegmentFileSizes = true) => Qs("include_segment_file_sizes", includeSegmentFileSizes);
 		public NodesStatsRequestDescriptor<TDocument> IncludeUnloadedSegments(bool? includeUnloadedSegments = true) => Qs("include_unloaded_segments", includeUnloadedSegments);
 		public NodesStatsRequestDescriptor<TDocument> Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level);
-		public NodesStatsRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public NodesStatsRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public NodesStatsRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public NodesStatsRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public NodesStatsRequestDescriptor<TDocument> Types(IEnumerable<string>? types) => Qs("types", types);
 		public NodesStatsRequestDescriptor<TDocument> NodeId(Elastic.Clients.Elasticsearch.NodeIds? node_id)
 		{
@@ -210,8 +210,8 @@ public NodesStatsRequestDescriptor(Elastic.Clients.Elasticsearch.NodeIds? node_i
 		public NodesStatsRequestDescriptor IncludeSegmentFileSizes(bool? includeSegmentFileSizes = true) => Qs("include_segment_file_sizes", includeSegmentFileSizes);
 		public NodesStatsRequestDescriptor IncludeUnloadedSegments(bool? includeUnloadedSegments = true) => Qs("include_unloaded_segments", includeUnloadedSegments);
 		public NodesStatsRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level);
-		public NodesStatsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public NodesStatsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public NodesStatsRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public NodesStatsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public NodesStatsRequestDescriptor Types(IEnumerable<string>? types) => Qs("types", types);
 		public NodesStatsRequestDescriptor NodeId(Elastic.Clients.Elasticsearch.NodeIds? node_id)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesUsageRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesUsageRequest.g.cs
index c95eb4a5f4c..993e68bc8de 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesUsageRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Nodes/NodesUsageRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.Nodes
 	public sealed class NodesUsageRequestParameters : RequestParameters<NodesUsageRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class NodesUsageRequest : PlainRequestBase<NodesUsageRequestParameters>
@@ -53,7 +53,7 @@ public NodesUsageRequest(Elastic.Clients.Elasticsearch.NodeIds? node_id, Elastic
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class NodesUsageRequestDescriptor : RequestDescriptorBase<NodesUsageRequestDescriptor, NodesUsageRequestParameters>
@@ -74,7 +74,7 @@ public NodesUsageRequestDescriptor(Elastic.Clients.Elasticsearch.NodeIds? node_i
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.NodesUsage;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public NodesUsageRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public NodesUsageRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public NodesUsageRequestDescriptor NodeId(Elastic.Clients.Elasticsearch.NodeIds? node_id)
 		{
 			RouteValues.Optional("node_id", node_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeRequest.g.cs
index 9277b1aec12..555947976c4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch
 	public sealed class OpenPointInTimeRequestParameters : RequestParameters<OpenPointInTimeRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Time>("keep_alive"); set => Q("keep_alive", value); }
+		public Elastic.Clients.Elasticsearch.Duration KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration>("keep_alive"); set => Q("keep_alive", value); }
 
 		[JsonIgnore]
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
@@ -44,7 +44,7 @@ public OpenPointInTimeRequest(Elastic.Clients.Elasticsearch.Indices indices) : b
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Time>("keep_alive"); set => Q("keep_alive", value); }
+		public Elastic.Clients.Elasticsearch.Duration KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration>("keep_alive"); set => Q("keep_alive", value); }
 
 		[JsonIgnore]
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
@@ -65,7 +65,7 @@ internal OpenPointInTimeRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		public OpenPointInTimeRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public OpenPointInTimeRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Time keepAlive) => Qs("keep_alive", keepAlive);
+		public OpenPointInTimeRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Duration keepAlive) => Qs("keep_alive", keepAlive);
 		public OpenPointInTimeRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
@@ -92,7 +92,7 @@ internal OpenPointInTimeRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		public OpenPointInTimeRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public OpenPointInTimeRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Time keepAlive) => Qs("keep_alive", keepAlive);
+		public OpenPointInTimeRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration keepAlive) => Qs("keep_alive", keepAlive);
 		public OpenPointInTimeRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 		{
 			RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptRequest.g.cs
index 0004e9f14f3..0cdf07f08a4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch
 	public sealed class PutScriptRequestParameters : RequestParameters<PutScriptRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class PutScriptRequest : PlainRequestBase<PutScriptRequestParameters>
@@ -48,10 +48,10 @@ public PutScriptRequest(Elastic.Clients.Elasticsearch.Id id, Elastic.Clients.Ela
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("script")]
@@ -76,8 +76,8 @@ internal PutScriptRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespacePutScript;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public PutScriptRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public PutScriptRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public PutScriptRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public PutScriptRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public PutScriptRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
@@ -161,8 +161,8 @@ internal PutScriptRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespacePutScript;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public PutScriptRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public PutScriptRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public PutScriptRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public PutScriptRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public PutScriptRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRequest.g.cs
index fff14aa2cee..8a16307f5b7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRequest.g.cs
@@ -31,16 +31,16 @@ public sealed class ReindexRequestParameters : RequestParameters<ReindexRequestP
 		public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Scroll { get => Q<Elastic.Clients.Elasticsearch.Time?>("scroll"); set => Q("scroll", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.Slices? Slices { get => Q<Elastic.Clients.Elasticsearch.Slices?>("slices"); set => Q("slices", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -61,16 +61,16 @@ public partial class ReindexRequest : PlainRequestBase<ReindexRequestParameters>
 		public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Scroll { get => Q<Elastic.Clients.Elasticsearch.Time?>("scroll"); set => Q("scroll", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.Slices? Slices { get => Q<Elastic.Clients.Elasticsearch.Slices?>("slices"); set => Q("slices", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -117,11 +117,11 @@ public ReindexRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public ReindexRequestDescriptor<TDocument> Refresh(bool? refresh = true) => Qs("refresh", refresh);
-		public ReindexRequestDescriptor<TDocument> RequestsPerSecond(long? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
+		public ReindexRequestDescriptor<TDocument> RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
 		public ReindexRequestDescriptor<TDocument> RequireAlias(bool? requireAlias = true) => Qs("require_alias", requireAlias);
-		public ReindexRequestDescriptor<TDocument> Scroll(Elastic.Clients.Elasticsearch.Time? scroll) => Qs("scroll", scroll);
+		public ReindexRequestDescriptor<TDocument> Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll);
 		public ReindexRequestDescriptor<TDocument> Slices(Elastic.Clients.Elasticsearch.Slices? slices) => Qs("slices", slices);
-		public ReindexRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ReindexRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public ReindexRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public ReindexRequestDescriptor<TDocument> WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
 		private ScriptBase? ScriptValue { get; set; }
@@ -322,11 +322,11 @@ public ReindexRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public ReindexRequestDescriptor Refresh(bool? refresh = true) => Qs("refresh", refresh);
-		public ReindexRequestDescriptor RequestsPerSecond(long? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
+		public ReindexRequestDescriptor RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
 		public ReindexRequestDescriptor RequireAlias(bool? requireAlias = true) => Qs("require_alias", requireAlias);
-		public ReindexRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Time? scroll) => Qs("scroll", scroll);
+		public ReindexRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll);
 		public ReindexRequestDescriptor Slices(Elastic.Clients.Elasticsearch.Slices? slices) => Qs("slices", slices);
-		public ReindexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public ReindexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public ReindexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public ReindexRequestDescriptor WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
 		private ScriptBase? ScriptValue { get; set; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexResponse.g.cs
index b2fce55fa4c..4553ecd085c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexResponse.g.cs
@@ -46,7 +46,7 @@ public sealed partial class ReindexResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("requests_per_second")]
-		public long? RequestsPerSecond { get; init; }
+		public float? RequestsPerSecond { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("retries")]
@@ -62,11 +62,11 @@ public sealed partial class ReindexResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("throttled_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? ThrottledMillis { get; init; }
+		public long? ThrottledMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("throttled_until_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? ThrottledUntilMillis { get; init; }
+		public long? ThrottledUntilMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("timed_out")]
@@ -74,7 +74,7 @@ public sealed partial class ReindexResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("took")]
-		public Elastic.Clients.Elasticsearch.Time? Took { get; init; }
+		public long? Took { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleRequest.g.cs
index 17c7f88726b..a520a524994 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch
 	public sealed class ReindexRethrottleRequestParameters : RequestParameters<ReindexRethrottleRequestParameters>
 	{
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 	}
 
 	public partial class ReindexRethrottleRequest : PlainRequestBase<ReindexRethrottleRequestParameters>
@@ -41,7 +41,7 @@ public ReindexRethrottleRequest(Elastic.Clients.Elasticsearch.Id task_id) : base
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 	}
 
 	public sealed partial class ReindexRethrottleRequestDescriptor : RequestDescriptorBase<ReindexRethrottleRequestDescriptor, ReindexRethrottleRequestParameters>
@@ -58,7 +58,7 @@ internal ReindexRethrottleRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceReindexRethrottle;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
-		public ReindexRethrottleRequestDescriptor RequestsPerSecond(long? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
+		public ReindexRethrottleRequestDescriptor RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
 		public ReindexRethrottleRequestDescriptor TaskId(Elastic.Clients.Elasticsearch.Id task_id)
 		{
 			RouteValues.Required("task_id", task_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptRequest.g.cs
index 0cbb7470c20..229a846a9c6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch
 	public sealed class ScriptRequestParameters : RequestParameters<ScriptRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class ScriptRequest : PlainRequestBase<ScriptRequestParameters>
@@ -41,7 +41,7 @@ public ScriptRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class ScriptRequestDescriptor<TDocument> : RequestDescriptorBase<ScriptRequestDescriptor<TDocument>, ScriptRequestParameters>
@@ -58,7 +58,7 @@ internal ScriptRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScript;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public ScriptRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ScriptRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public ScriptRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
@@ -84,7 +84,7 @@ internal ScriptRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScript;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public ScriptRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public ScriptRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public ScriptRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollRequest.g.cs
index dcc0dbb9e15..b2ec3b3cb70 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollRequest.g.cs
@@ -41,7 +41,7 @@ public partial class ScrollRequest : PlainRequestBase<ScrollRequestParameters>
 
 		[JsonInclude]
 		[JsonPropertyName("scroll")]
-		public Elastic.Clients.Elasticsearch.Time? Scroll { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Scroll { get; set; }
 	}
 
 	public sealed partial class ScrollRequestDescriptor : RequestDescriptorBase<ScrollRequestDescriptor, ScrollRequestParameters>
@@ -55,9 +55,9 @@ public ScrollRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public ScrollRequestDescriptor RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt);
-		private Elastic.Clients.Elasticsearch.Time? ScrollValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? ScrollValue { get; set; }
 
-		public ScrollRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Time? scroll)
+		public ScrollRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Duration? scroll)
 		{
 			ScrollValue = scroll;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs
index ece331c1969..bcc5241c9fc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs
@@ -82,7 +82,7 @@ public sealed class SearchRequestParameters : RequestParameters<SearchRequestPar
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Scroll { get => Q<Elastic.Clients.Elasticsearch.Time?>("scroll"); set => Q("scroll", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
@@ -183,7 +183,7 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Scroll { get => Q<Elastic.Clients.Elasticsearch.Time?>("scroll"); set => Q("scroll", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
@@ -379,7 +379,7 @@ public SearchRequestDescriptor(Elasticsearch.Indices? indices) : base(r => r.Opt
 		public SearchRequestDescriptor<TDocument> RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache);
 		public SearchRequestDescriptor<TDocument> RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt);
 		public SearchRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public SearchRequestDescriptor<TDocument> Scroll(Elastic.Clients.Elasticsearch.Time? scroll) => Qs("scroll", scroll);
+		public SearchRequestDescriptor<TDocument> Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll);
 		public SearchRequestDescriptor<TDocument> SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 		public SearchRequestDescriptor<TDocument> SuggestField(Elastic.Clients.Elasticsearch.Field? suggestField) => Qs("suggest_field", suggestField);
 		public SearchRequestDescriptor<TDocument> SuggestMode(Elastic.Clients.Elasticsearch.SuggestMode? suggestMode) => Qs("suggest_mode", suggestMode);
@@ -1320,7 +1320,7 @@ public SearchRequestDescriptor()
 		public SearchRequestDescriptor RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache);
 		public SearchRequestDescriptor RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt);
 		public SearchRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public SearchRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Time? scroll) => Qs("scroll", scroll);
+		public SearchRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll);
 		public SearchRequestDescriptor SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 		public SearchRequestDescriptor SuggestField(Elastic.Clients.Elasticsearch.Field? suggestField) => Qs("suggest_field", suggestField);
 		public SearchRequestDescriptor SuggestMode(Elastic.Clients.Elasticsearch.SuggestMode? suggestMode) => Qs("suggest_mode", suggestMode);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/SearchableSnapshotsMountRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/SearchableSnapshotsMountRequest.g.cs
index 4de5c414c4f..8013d90d127 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/SearchableSnapshotsMountRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchableSnapshots/SearchableSnapshotsMountRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.SearchableSnapshots
 	public sealed class SearchableSnapshotsMountRequestParameters : RequestParameters<SearchableSnapshotsMountRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
@@ -47,7 +47,7 @@ public SearchableSnapshotsMountRequest(Elastic.Clients.Elasticsearch.Name reposi
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
@@ -86,7 +86,7 @@ internal SearchableSnapshotsMountRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.SearchableSnapshotsMount;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
-		public SearchableSnapshotsMountRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SearchableSnapshotsMountRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public SearchableSnapshotsMountRequestDescriptor Storage(string? storage) => Qs("storage", storage);
 		public SearchableSnapshotsMountRequestDescriptor WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
 		public SearchableSnapshotsMountRequestDescriptor Repository(Elastic.Clients.Elasticsearch.Name repository)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SecurityGrantApiKeyResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SecurityGrantApiKeyResponse.g.cs
index b50e52631ec..2afbc3cf66b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SecurityGrantApiKeyResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Security/SecurityGrantApiKeyResponse.g.cs
@@ -30,7 +30,7 @@ public sealed partial class SecurityGrantApiKeyResponse : ElasticsearchResponseB
 
 		[JsonInclude]
 		[JsonPropertyName("expiration")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? Expiration { get; init; }
+		public long? Expiration { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("id")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Slm/SlmGetStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Slm/SlmGetStatsResponse.g.cs
index 0567975e68b..8226871b65d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Slm/SlmGetStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Slm/SlmGetStatsResponse.g.cs
@@ -30,11 +30,11 @@ public sealed partial class SlmGetStatsResponse : ElasticsearchResponseBase
 
 		[JsonInclude]
 		[JsonPropertyName("retention_deletion_time")]
-		public string RetentionDeletionTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration RetentionDeletionTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("retention_deletion_time_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis RetentionDeletionTimeMillis { get; init; }
+		public long RetentionDeletionTimeMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("retention_failed")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Slm/SlmPutLifecycleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Slm/SlmPutLifecycleRequest.g.cs
index d58115354cb..f8864ee17b5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Slm/SlmPutLifecycleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Slm/SlmPutLifecycleRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Slm
 	public sealed class SlmPutLifecycleRequestParameters : RequestParameters<SlmPutLifecycleRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class SlmPutLifecycleRequest : PlainRequestBase<SlmPutLifecycleRequestParameters>
@@ -44,10 +44,10 @@ public SlmPutLifecycleRequest(Elastic.Clients.Elasticsearch.Name policy_id) : ba
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("config")]
@@ -84,8 +84,8 @@ internal SlmPutLifecycleRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotLifecycleManagementPutLifecycle;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public SlmPutLifecycleRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public SlmPutLifecycleRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public SlmPutLifecycleRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SlmPutLifecycleRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public SlmPutLifecycleRequestDescriptor PolicyId(Elastic.Clients.Elasticsearch.Name policy_id)
 		{
 			RouteValues.Required("policy_id", policy_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateSnapshotRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateSnapshotRequest.g.cs
index 8ffc8024be8..e583ba497d7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateSnapshotRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/CreateSnapshotRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.Snapshot
 	public sealed class CreateSnapshotRequestParameters : RequestParameters<CreateSnapshotRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
@@ -44,7 +44,7 @@ public CreateSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elas
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
@@ -88,7 +88,7 @@ internal CreateSnapshotRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotCreate;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public CreateSnapshotRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public CreateSnapshotRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public CreateSnapshotRequestDescriptor WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
 		public CreateSnapshotRequestDescriptor Repository(Elastic.Clients.Elasticsearch.Name repository)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/DeleteSnapshotRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/DeleteSnapshotRequest.g.cs
index e377b3b51a5..e223cd5d854 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/DeleteSnapshotRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/DeleteSnapshotRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.Snapshot
 	public sealed class DeleteSnapshotRequestParameters : RequestParameters<DeleteSnapshotRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class DeleteSnapshotRequest : PlainRequestBase<DeleteSnapshotRequestParameters>
@@ -41,7 +41,7 @@ public DeleteSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elas
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class DeleteSnapshotRequestDescriptor : RequestDescriptorBase<DeleteSnapshotRequestDescriptor, DeleteSnapshotRequestParameters>
@@ -58,7 +58,7 @@ internal DeleteSnapshotRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotDelete;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public DeleteSnapshotRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public DeleteSnapshotRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public DeleteSnapshotRequestDescriptor Repository(Elastic.Clients.Elasticsearch.Name repository)
 		{
 			RouteValues.Required("repository", repository);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/GetSnapshotRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/GetSnapshotRequest.g.cs
index fd0cd820bb8..e7e0d9b8c4d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/GetSnapshotRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/GetSnapshotRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class GetSnapshotRequestParameters : RequestParameters<GetSnapshot
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? Verbose { get => Q<bool?>("verbose"); set => Q("verbose", value); }
@@ -77,7 +77,7 @@ public GetSnapshotRequest(Elastic.Clients.Elasticsearch.Name repository, Elastic
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? Verbose { get => Q<bool?>("verbose"); set => Q("verbose", value); }
@@ -129,7 +129,7 @@ internal GetSnapshotRequestDescriptor()
 		public GetSnapshotRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 		public GetSnapshotRequestDescriptor IncludeRepository(bool? includeRepository = true) => Qs("include_repository", includeRepository);
 		public GetSnapshotRequestDescriptor IndexDetails(bool? indexDetails = true) => Qs("index_details", indexDetails);
-		public GetSnapshotRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public GetSnapshotRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public GetSnapshotRequestDescriptor Offset(int? offset) => Qs("offset", offset);
 		public GetSnapshotRequestDescriptor Order(Elastic.Clients.Elasticsearch.SortOrder? order) => Qs("order", order);
 		public GetSnapshotRequestDescriptor Size(int? size) => Qs("size", size);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCleanupRepositoryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCleanupRepositoryRequest.g.cs
index 54e3c6868f8..ba2fb4ca38c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCleanupRepositoryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCleanupRepositoryRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Snapshot
 	public sealed class SnapshotCleanupRepositoryRequestParameters : RequestParameters<SnapshotCleanupRepositoryRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class SnapshotCleanupRepositoryRequest : PlainRequestBase<SnapshotCleanupRepositoryRequestParameters>
@@ -44,10 +44,10 @@ public SnapshotCleanupRepositoryRequest(Elastic.Clients.Elasticsearch.Name repos
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class SnapshotCleanupRepositoryRequestDescriptor : RequestDescriptorBase<SnapshotCleanupRepositoryRequestDescriptor, SnapshotCleanupRepositoryRequestParameters>
@@ -64,8 +64,8 @@ internal SnapshotCleanupRepositoryRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotCleanupRepository;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
-		public SnapshotCleanupRepositoryRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public SnapshotCleanupRepositoryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public SnapshotCleanupRepositoryRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SnapshotCleanupRepositoryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public SnapshotCleanupRepositoryRequestDescriptor Repository(Elastic.Clients.Elasticsearch.Name repository)
 		{
 			RouteValues.Required("repository", repository);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCloneRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCloneRequest.g.cs
index c4c56e03aee..6256f95cdf0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCloneRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCloneRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Snapshot
 	public sealed class SnapshotCloneRequestParameters : RequestParameters<SnapshotCloneRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class SnapshotCloneRequest : PlainRequestBase<SnapshotCloneRequestParameters>
@@ -44,10 +44,10 @@ public SnapshotCloneRequest(Elastic.Clients.Elasticsearch.Name repository, Elast
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("indices")]
@@ -68,8 +68,8 @@ internal SnapshotCloneRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotClone;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public SnapshotCloneRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public SnapshotCloneRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public SnapshotCloneRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SnapshotCloneRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public SnapshotCloneRequestDescriptor Repository(Elastic.Clients.Elasticsearch.Name repository)
 		{
 			RouteValues.Required("repository", repository);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCreateRepositoryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCreateRepositoryRequest.g.cs
index fb1e42edb9f..6059f672200 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCreateRepositoryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotCreateRepositoryRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Snapshot
 	public sealed class SnapshotCreateRepositoryRequestParameters : RequestParameters<SnapshotCreateRepositoryRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public bool? Verify { get => Q<bool?>("verify"); set => Q("verify", value); }
@@ -47,10 +47,10 @@ public SnapshotCreateRepositoryRequest(Elastic.Clients.Elasticsearch.Name reposi
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public bool? Verify { get => Q<bool?>("verify"); set => Q("verify", value); }
@@ -78,8 +78,8 @@ internal SnapshotCreateRepositoryRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotCreateRepository;
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
-		public SnapshotCreateRepositoryRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public SnapshotCreateRepositoryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public SnapshotCreateRepositoryRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SnapshotCreateRepositoryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public SnapshotCreateRepositoryRequestDescriptor Verify(bool? verify = true) => Qs("verify", verify);
 		public SnapshotCreateRepositoryRequestDescriptor Repository(Elastic.Clients.Elasticsearch.Name repository)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotDeleteRepositoryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotDeleteRepositoryRequest.g.cs
index 6b46696fca5..8aad00dff43 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotDeleteRepositoryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotDeleteRepositoryRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Snapshot
 	public sealed class SnapshotDeleteRepositoryRequestParameters : RequestParameters<SnapshotDeleteRepositoryRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class SnapshotDeleteRepositoryRequest : PlainRequestBase<SnapshotDeleteRepositoryRequestParameters>
@@ -44,10 +44,10 @@ public SnapshotDeleteRepositoryRequest(Elastic.Clients.Elasticsearch.Names repos
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class SnapshotDeleteRepositoryRequestDescriptor : RequestDescriptorBase<SnapshotDeleteRepositoryRequestDescriptor, SnapshotDeleteRepositoryRequestParameters>
@@ -64,8 +64,8 @@ internal SnapshotDeleteRepositoryRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotDeleteRepository;
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
-		public SnapshotDeleteRepositoryRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public SnapshotDeleteRepositoryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public SnapshotDeleteRepositoryRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SnapshotDeleteRepositoryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public SnapshotDeleteRepositoryRequestDescriptor Repository(Elastic.Clients.Elasticsearch.Names repository)
 		{
 			RouteValues.Required("repository", repository);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotGetRepositoryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotGetRepositoryRequest.g.cs
index 02b915fb351..c999caf144e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotGetRepositoryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotGetRepositoryRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class SnapshotGetRepositoryRequestParameters : RequestParameters<S
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class SnapshotGetRepositoryRequest : PlainRequestBase<SnapshotGetRepositoryRequestParameters>
@@ -51,7 +51,7 @@ public SnapshotGetRepositoryRequest(Elastic.Clients.Elasticsearch.Names? reposit
 		public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class SnapshotGetRepositoryRequestDescriptor : RequestDescriptorBase<SnapshotGetRepositoryRequestDescriptor, SnapshotGetRepositoryRequestParameters>
@@ -65,7 +65,7 @@ public SnapshotGetRepositoryRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		public SnapshotGetRepositoryRequestDescriptor Local(bool? local = true) => Qs("local", local);
-		public SnapshotGetRepositoryRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SnapshotGetRepositoryRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public SnapshotGetRepositoryRequestDescriptor Repository(Elastic.Clients.Elasticsearch.Names? repository)
 		{
 			RouteValues.Optional("repository", repository);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotRestoreRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotRestoreRequest.g.cs
index 678102941d7..ebc5bd9ddb6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotRestoreRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotRestoreRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.Snapshot
 	public sealed class SnapshotRestoreRequestParameters : RequestParameters<SnapshotRestoreRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
@@ -44,7 +44,7 @@ public SnapshotRestoreRequest(Elastic.Clients.Elasticsearch.Name repository, Ela
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
 		public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
@@ -100,7 +100,7 @@ internal SnapshotRestoreRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotRestore;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
-		public SnapshotRestoreRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SnapshotRestoreRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public SnapshotRestoreRequestDescriptor<TDocument> WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
 		public SnapshotRestoreRequestDescriptor<TDocument> Repository(Elastic.Clients.Elasticsearch.Name repository)
 		{
@@ -293,7 +293,7 @@ internal SnapshotRestoreRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotRestore;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
-		public SnapshotRestoreRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SnapshotRestoreRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public SnapshotRestoreRequestDescriptor WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
 		public SnapshotRestoreRequestDescriptor Repository(Elastic.Clients.Elasticsearch.Name repository)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotStatusRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotStatusRequest.g.cs
index d6dfdd84808..07456e14400 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotStatusRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotStatusRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class SnapshotStatusRequestParameters : RequestParameters<Snapshot
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class SnapshotStatusRequest : PlainRequestBase<SnapshotStatusRequestParameters>
@@ -55,7 +55,7 @@ public SnapshotStatusRequest(Elastic.Clients.Elasticsearch.Name? repository, Ela
 		public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class SnapshotStatusRequestDescriptor : RequestDescriptorBase<SnapshotStatusRequestDescriptor, SnapshotStatusRequestParameters>
@@ -73,7 +73,7 @@ public SnapshotStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Name? repos
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		public SnapshotStatusRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
-		public SnapshotStatusRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SnapshotStatusRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		public SnapshotStatusRequestDescriptor Repository(Elastic.Clients.Elasticsearch.Name? repository)
 		{
 			RouteValues.Optional("repository", repository);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotVerifyRepositoryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotVerifyRepositoryRequest.g.cs
index 82b8d28121c..a149ec4726a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotVerifyRepositoryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Snapshot/SnapshotVerifyRepositoryRequest.g.cs
@@ -28,10 +28,10 @@ namespace Elastic.Clients.Elasticsearch.Snapshot
 	public sealed class SnapshotVerifyRepositoryRequestParameters : RequestParameters<SnapshotVerifyRepositoryRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class SnapshotVerifyRepositoryRequest : PlainRequestBase<SnapshotVerifyRepositoryRequestParameters>
@@ -44,10 +44,10 @@ public SnapshotVerifyRepositoryRequest(Elastic.Clients.Elasticsearch.Name reposi
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class SnapshotVerifyRepositoryRequestDescriptor : RequestDescriptorBase<SnapshotVerifyRepositoryRequestDescriptor, SnapshotVerifyRepositoryRequestParameters>
@@ -64,8 +64,8 @@ internal SnapshotVerifyRepositoryRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotVerifyRepository;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
-		public SnapshotVerifyRepositoryRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
-		public SnapshotVerifyRepositoryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public SnapshotVerifyRepositoryRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public SnapshotVerifyRepositoryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public SnapshotVerifyRepositoryRequestDescriptor Repository(Elastic.Clients.Elasticsearch.Name repository)
 		{
 			RouteValues.Required("repository", repository);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncRequest.g.cs
index 2be5da142a1..f7502c2d57b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlGetAsyncRequest.g.cs
@@ -34,10 +34,10 @@ public sealed class SqlGetAsyncRequestParameters : RequestParameters<SqlGetAsync
 		public string? Format { get => Q<string?>("format"); set => Q("format", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Time?>("keep_alive"); set => Q("keep_alive", value); }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 	}
 
 	public partial class SqlGetAsyncRequest : PlainRequestBase<SqlGetAsyncRequestParameters>
@@ -56,10 +56,10 @@ public SqlGetAsyncRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Req
 		public string? Format { get => Q<string?>("format"); set => Q("format", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Time?>("keep_alive"); set => Q("keep_alive", value); }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 	}
 
 	public sealed partial class SqlGetAsyncRequestDescriptor<TDocument> : RequestDescriptorBase<SqlGetAsyncRequestDescriptor<TDocument>, SqlGetAsyncRequestParameters>
@@ -78,8 +78,8 @@ internal SqlGetAsyncRequestDescriptor()
 		protected override bool SupportsBody => false;
 		public SqlGetAsyncRequestDescriptor<TDocument> Delimiter(string? delimiter) => Qs("delimiter", delimiter);
 		public SqlGetAsyncRequestDescriptor<TDocument> Format(string? format) => Qs("format", format);
-		public SqlGetAsyncRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive) => Qs("keep_alive", keepAlive);
-		public SqlGetAsyncRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+		public SqlGetAsyncRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
+		public SqlGetAsyncRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
 		public SqlGetAsyncRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
@@ -107,8 +107,8 @@ internal SqlGetAsyncRequestDescriptor()
 		protected override bool SupportsBody => false;
 		public SqlGetAsyncRequestDescriptor Delimiter(string? delimiter) => Qs("delimiter", delimiter);
 		public SqlGetAsyncRequestDescriptor Format(string? format) => Qs("format", format);
-		public SqlGetAsyncRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive) => Qs("keep_alive", keepAlive);
-		public SqlGetAsyncRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+		public SqlGetAsyncRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
+		public SqlGetAsyncRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
 		public SqlGetAsyncRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 		{
 			RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlQueryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlQueryRequest.g.cs
index 31b01448aa0..e4c25e9cb5a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlQueryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/SqlQueryRequest.g.cs
@@ -60,11 +60,11 @@ public partial class SqlQueryRequest : PlainRequestBase<SqlQueryRequestParameter
 
 		[JsonInclude]
 		[JsonPropertyName("request_timeout")]
-		public Elastic.Clients.Elasticsearch.Time? RequestTimeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? RequestTimeout { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("page_timeout")]
-		public Elastic.Clients.Elasticsearch.Time? PageTimeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? PageTimeout { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("time_zone")]
@@ -80,7 +80,7 @@ public partial class SqlQueryRequest : PlainRequestBase<SqlQueryRequestParameter
 
 		[JsonInclude]
 		[JsonPropertyName("wait_for_completion_timeout")]
-		public Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("params")]
@@ -88,7 +88,7 @@ public partial class SqlQueryRequest : PlainRequestBase<SqlQueryRequestParameter
 
 		[JsonInclude]
 		[JsonPropertyName("keep_alive")]
-		public Elastic.Clients.Elasticsearch.Time? KeepAlive { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("keep_on_completion")]
@@ -127,23 +127,23 @@ public SqlQueryRequestDescriptor()
 
 		private bool? IndexUsingFrozenValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? KeepAliveValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? KeepAliveValue { get; set; }
 
 		private bool? KeepOnCompletionValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? PageTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? PageTimeoutValue { get; set; }
 
 		private Dictionary<string, object>? ParamsValue { get; set; }
 
 		private string? QueryValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? RequestTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? RequestTimeoutValue { get; set; }
 
 		private Dictionary<Elastic.Clients.Elasticsearch.Field, IEnumerable<Elastic.Clients.Elasticsearch.Mapping.RuntimeField>>? RuntimeMappingsValue { get; set; }
 
 		private string? TimeZoneValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeoutValue { get; set; }
 
 		public SqlQueryRequestDescriptor<TDocument> Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter)
 		{
@@ -205,7 +205,7 @@ public SqlQueryRequestDescriptor<TDocument> IndexUsingFrozen(bool? indexUsingFro
 			return Self;
 		}
 
-		public SqlQueryRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive)
+		public SqlQueryRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive)
 		{
 			KeepAliveValue = keepAlive;
 			return Self;
@@ -217,7 +217,7 @@ public SqlQueryRequestDescriptor<TDocument> KeepOnCompletion(bool? keepOnComplet
 			return Self;
 		}
 
-		public SqlQueryRequestDescriptor<TDocument> PageTimeout(Elastic.Clients.Elasticsearch.Time? pageTimeout)
+		public SqlQueryRequestDescriptor<TDocument> PageTimeout(Elastic.Clients.Elasticsearch.Duration? pageTimeout)
 		{
 			PageTimeoutValue = pageTimeout;
 			return Self;
@@ -235,7 +235,7 @@ public SqlQueryRequestDescriptor<TDocument> Query(string? query)
 			return Self;
 		}
 
-		public SqlQueryRequestDescriptor<TDocument> RequestTimeout(Elastic.Clients.Elasticsearch.Time? requestTimeout)
+		public SqlQueryRequestDescriptor<TDocument> RequestTimeout(Elastic.Clients.Elasticsearch.Duration? requestTimeout)
 		{
 			RequestTimeoutValue = requestTimeout;
 			return Self;
@@ -253,7 +253,7 @@ public SqlQueryRequestDescriptor<TDocument> TimeZone(string? timeZone)
 			return Self;
 		}
 
-		public SqlQueryRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout)
+		public SqlQueryRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout)
 		{
 			WaitForCompletionTimeoutValue = waitForCompletionTimeout;
 			return Self;
@@ -356,10 +356,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				JsonSerializer.Serialize(writer, RuntimeMappingsValue, options);
 			}
 
-			if (!string.IsNullOrEmpty(TimeZoneValue))
+			if (TimeZoneValue is not null)
 			{
 				writer.WritePropertyName("time_zone");
-				writer.WriteStringValue(TimeZoneValue);
+				JsonSerializer.Serialize(writer, TimeZoneValue, options);
 			}
 
 			if (WaitForCompletionTimeoutValue is not null)
@@ -400,23 +400,23 @@ public SqlQueryRequestDescriptor()
 
 		private bool? IndexUsingFrozenValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? KeepAliveValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? KeepAliveValue { get; set; }
 
 		private bool? KeepOnCompletionValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? PageTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? PageTimeoutValue { get; set; }
 
 		private Dictionary<string, object>? ParamsValue { get; set; }
 
 		private string? QueryValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? RequestTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? RequestTimeoutValue { get; set; }
 
 		private Dictionary<Elastic.Clients.Elasticsearch.Field, IEnumerable<Elastic.Clients.Elasticsearch.Mapping.RuntimeField>>? RuntimeMappingsValue { get; set; }
 
 		private string? TimeZoneValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? WaitForCompletionTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeoutValue { get; set; }
 
 		public SqlQueryRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? filter)
 		{
@@ -478,7 +478,7 @@ public SqlQueryRequestDescriptor IndexUsingFrozen(bool? indexUsingFrozen = true)
 			return Self;
 		}
 
-		public SqlQueryRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive)
+		public SqlQueryRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive)
 		{
 			KeepAliveValue = keepAlive;
 			return Self;
@@ -490,7 +490,7 @@ public SqlQueryRequestDescriptor KeepOnCompletion(bool? keepOnCompletion = true)
 			return Self;
 		}
 
-		public SqlQueryRequestDescriptor PageTimeout(Elastic.Clients.Elasticsearch.Time? pageTimeout)
+		public SqlQueryRequestDescriptor PageTimeout(Elastic.Clients.Elasticsearch.Duration? pageTimeout)
 		{
 			PageTimeoutValue = pageTimeout;
 			return Self;
@@ -508,7 +508,7 @@ public SqlQueryRequestDescriptor Query(string? query)
 			return Self;
 		}
 
-		public SqlQueryRequestDescriptor RequestTimeout(Elastic.Clients.Elasticsearch.Time? requestTimeout)
+		public SqlQueryRequestDescriptor RequestTimeout(Elastic.Clients.Elasticsearch.Duration? requestTimeout)
 		{
 			RequestTimeoutValue = requestTimeout;
 			return Self;
@@ -526,7 +526,7 @@ public SqlQueryRequestDescriptor TimeZone(string? timeZone)
 			return Self;
 		}
 
-		public SqlQueryRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Time? waitForCompletionTimeout)
+		public SqlQueryRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout)
 		{
 			WaitForCompletionTimeoutValue = waitForCompletionTimeout;
 			return Self;
@@ -629,10 +629,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				JsonSerializer.Serialize(writer, RuntimeMappingsValue, options);
 			}
 
-			if (!string.IsNullOrEmpty(TimeZoneValue))
+			if (TimeZoneValue is not null)
 			{
 				writer.WritePropertyName("time_zone");
-				writer.WriteStringValue(TimeZoneValue);
+				JsonSerializer.Serialize(writer, TimeZoneValue, options);
 			}
 
 			if (WaitForCompletionTimeoutValue is not null)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs
index c164c2f9292..b366c9aeb3a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs
@@ -48,7 +48,7 @@ public TermsEnumRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r
 
 		[JsonInclude]
 		[JsonPropertyName("timeout")]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("case_insensitive")]
@@ -107,7 +107,7 @@ public TermsEnumRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch
 
 		private string? StringValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? TimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; }
 
 		public TermsEnumRequestDescriptor<TDocument> IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? indexFilter)
 		{
@@ -169,7 +169,7 @@ public TermsEnumRequestDescriptor<TDocument> String(string? value)
 			return Self;
 		}
 
-		public TermsEnumRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout)
+		public TermsEnumRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout)
 		{
 			TimeoutValue = timeout;
 			return Self;
@@ -266,7 +266,7 @@ public TermsEnumRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName
 
 		private string? StringValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? TimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; }
 
 		public TermsEnumRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? indexFilter)
 		{
@@ -334,7 +334,7 @@ public TermsEnumRequestDescriptor String(string? value)
 			return Self;
 		}
 
-		public TermsEnumRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout)
+		public TermsEnumRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout)
 		{
 			TimeoutValue = timeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformDeleteTransformRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformDeleteTransformRequest.g.cs
index 516cded3afa..b048d53a63f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformDeleteTransformRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformDeleteTransformRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class TransformDeleteTransformRequestParameters : RequestParameter
 		public bool? Force { get => Q<bool?>("force"); set => Q("force", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class TransformDeleteTransformRequest : PlainRequestBase<TransformDeleteTransformRequestParameters>
@@ -47,7 +47,7 @@ public TransformDeleteTransformRequest(Elastic.Clients.Elasticsearch.Id transfor
 		public bool? Force { get => Q<bool?>("force"); set => Q("force", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class TransformDeleteTransformRequestDescriptor : RequestDescriptorBase<TransformDeleteTransformRequestDescriptor, TransformDeleteTransformRequestParameters>
@@ -65,7 +65,7 @@ internal TransformDeleteTransformRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.DELETE;
 		protected override bool SupportsBody => false;
 		public TransformDeleteTransformRequestDescriptor Force(bool? force = true) => Qs("force", force);
-		public TransformDeleteTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public TransformDeleteTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public TransformDeleteTransformRequestDescriptor TransformId(Elastic.Clients.Elasticsearch.Id transform_id)
 		{
 			RouteValues.Required("transform_id", transform_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformPreviewTransformRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformPreviewTransformRequest.g.cs
index 87ef27d4d8e..78f6dc77431 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformPreviewTransformRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformPreviewTransformRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.TransformManagement
 	public sealed class TransformPreviewTransformRequestParameters : RequestParameters<TransformPreviewTransformRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class TransformPreviewTransformRequest : PlainRequestBase<TransformPreviewTransformRequestParameters>
@@ -45,7 +45,7 @@ public TransformPreviewTransformRequest(Elastic.Clients.Elasticsearch.Id? transf
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("dest")]
@@ -57,7 +57,7 @@ public TransformPreviewTransformRequest(Elastic.Clients.Elasticsearch.Id? transf
 
 		[JsonInclude]
 		[JsonPropertyName("frequency")]
-		public Elastic.Clients.Elasticsearch.Time? Frequency { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Frequency { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("pivot")]
@@ -94,7 +94,7 @@ public TransformPreviewTransformRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.TransformManagementPreviewTransform;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
-		public TransformPreviewTransformRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public TransformPreviewTransformRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public TransformPreviewTransformRequestDescriptor<TDocument> TransformId(Elastic.Clients.Elasticsearch.Id? transform_id)
 		{
 			RouteValues.Optional("transform_id", transform_id);
@@ -133,7 +133,7 @@ public TransformPreviewTransformRequestDescriptor<TDocument> TransformId(Elastic
 
 		private Action<DestinationDescriptor> DestDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.TransformManagement.Pivot? PivotValue { get; set; }
 
@@ -273,7 +273,7 @@ public TransformPreviewTransformRequestDescriptor<TDocument> Dest(Action<Destina
 			return Self;
 		}
 
-		public TransformPreviewTransformRequestDescriptor<TDocument> Frequency(Elastic.Clients.Elasticsearch.Time? frequency)
+		public TransformPreviewTransformRequestDescriptor<TDocument> Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
@@ -468,7 +468,7 @@ public TransformPreviewTransformRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.TransformManagementPreviewTransform;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
-		public TransformPreviewTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public TransformPreviewTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public TransformPreviewTransformRequestDescriptor TransformId(Elastic.Clients.Elasticsearch.Id? transform_id)
 		{
 			RouteValues.Optional("transform_id", transform_id);
@@ -507,7 +507,7 @@ public TransformPreviewTransformRequestDescriptor TransformId(Elastic.Clients.El
 
 		private Action<DestinationDescriptor> DestDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.TransformManagement.Pivot? PivotValue { get; set; }
 
@@ -647,7 +647,7 @@ public TransformPreviewTransformRequestDescriptor Dest(Action<DestinationDescrip
 			return Self;
 		}
 
-		public TransformPreviewTransformRequestDescriptor Frequency(Elastic.Clients.Elasticsearch.Time? frequency)
+		public TransformPreviewTransformRequestDescriptor Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformPutTransformRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformPutTransformRequest.g.cs
index 0a06653f91e..05fcf6a9c95 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformPutTransformRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformPutTransformRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class TransformPutTransformRequestParameters : RequestParameters<T
 		public bool? DeferValidation { get => Q<bool?>("defer_validation"); set => Q("defer_validation", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class TransformPutTransformRequest : PlainRequestBase<TransformPutTransformRequestParameters>
@@ -47,7 +47,7 @@ public TransformPutTransformRequest(Elastic.Clients.Elasticsearch.Id transform_i
 		public bool? DeferValidation { get => Q<bool?>("defer_validation"); set => Q("defer_validation", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("dest")]
@@ -59,7 +59,7 @@ public TransformPutTransformRequest(Elastic.Clients.Elasticsearch.Id transform_i
 
 		[JsonInclude]
 		[JsonPropertyName("frequency")]
-		public Elastic.Clients.Elasticsearch.Time? Frequency { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Frequency { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("latest")]
@@ -105,7 +105,7 @@ internal TransformPutTransformRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		public TransformPutTransformRequestDescriptor<TDocument> DeferValidation(bool? deferValidation = true) => Qs("defer_validation", deferValidation);
-		public TransformPutTransformRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public TransformPutTransformRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public TransformPutTransformRequestDescriptor<TDocument> TransformId(Elastic.Clients.Elasticsearch.Id transform_id)
 		{
 			RouteValues.Required("transform_id", transform_id);
@@ -146,7 +146,7 @@ public TransformPutTransformRequestDescriptor<TDocument> TransformId(Elastic.Cli
 
 		private Action<DestinationDescriptor> DestDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.TransformManagement.Pivot? PivotValue { get; set; }
 
@@ -292,7 +292,7 @@ public TransformPutTransformRequestDescriptor<TDocument> Dest(Action<Destination
 			return Self;
 		}
 
-		public TransformPutTransformRequestDescriptor<TDocument> Frequency(Elastic.Clients.Elasticsearch.Time? frequency)
+		public TransformPutTransformRequestDescriptor<TDocument> Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
@@ -498,7 +498,7 @@ internal TransformPutTransformRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 		protected override bool SupportsBody => true;
 		public TransformPutTransformRequestDescriptor DeferValidation(bool? deferValidation = true) => Qs("defer_validation", deferValidation);
-		public TransformPutTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public TransformPutTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public TransformPutTransformRequestDescriptor TransformId(Elastic.Clients.Elasticsearch.Id transform_id)
 		{
 			RouteValues.Required("transform_id", transform_id);
@@ -539,7 +539,7 @@ public TransformPutTransformRequestDescriptor TransformId(Elastic.Clients.Elasti
 
 		private Action<DestinationDescriptor> DestDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.TransformManagement.Pivot? PivotValue { get; set; }
 
@@ -685,7 +685,7 @@ public TransformPutTransformRequestDescriptor Dest(Action<DestinationDescriptor>
 			return Self;
 		}
 
-		public TransformPutTransformRequestDescriptor Frequency(Elastic.Clients.Elasticsearch.Time? frequency)
+		public TransformPutTransformRequestDescriptor Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformStartTransformRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformStartTransformRequest.g.cs
index 6a171502069..7cca2ed5a26 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformStartTransformRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformStartTransformRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.TransformManagement
 	public sealed class TransformStartTransformRequestParameters : RequestParameters<TransformStartTransformRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class TransformStartTransformRequest : PlainRequestBase<TransformStartTransformRequestParameters>
@@ -41,7 +41,7 @@ public TransformStartTransformRequest(Elastic.Clients.Elasticsearch.Id transform
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class TransformStartTransformRequestDescriptor : RequestDescriptorBase<TransformStartTransformRequestDescriptor, TransformStartTransformRequestParameters>
@@ -58,7 +58,7 @@ internal TransformStartTransformRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.TransformManagementStartTransform;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
-		public TransformStartTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public TransformStartTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public TransformStartTransformRequestDescriptor TransformId(Elastic.Clients.Elasticsearch.Id transform_id)
 		{
 			RouteValues.Required("transform_id", transform_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformStopTransformRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformStopTransformRequest.g.cs
index 59b34b9137f..9c64d4660cc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformStopTransformRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformStopTransformRequest.g.cs
@@ -34,7 +34,7 @@ public sealed class TransformStopTransformRequestParameters : RequestParameters<
 		public bool? Force { get => Q<bool?>("force"); set => Q("force", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public bool? WaitForCheckpoint { get => Q<bool?>("wait_for_checkpoint"); set => Q("wait_for_checkpoint", value); }
@@ -59,7 +59,7 @@ public TransformStopTransformRequest(Elastic.Clients.Elasticsearch.Name transfor
 		public bool? Force { get => Q<bool?>("force"); set => Q("force", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public bool? WaitForCheckpoint { get => Q<bool?>("wait_for_checkpoint"); set => Q("wait_for_checkpoint", value); }
@@ -84,7 +84,7 @@ internal TransformStopTransformRequestDescriptor()
 		protected override bool SupportsBody => false;
 		public TransformStopTransformRequestDescriptor AllowNoMatch(bool? allowNoMatch = true) => Qs("allow_no_match", allowNoMatch);
 		public TransformStopTransformRequestDescriptor Force(bool? force = true) => Qs("force", force);
-		public TransformStopTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public TransformStopTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public TransformStopTransformRequestDescriptor WaitForCheckpoint(bool? waitForCheckpoint = true) => Qs("wait_for_checkpoint", waitForCheckpoint);
 		public TransformStopTransformRequestDescriptor WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
 		public TransformStopTransformRequestDescriptor TransformId(Elastic.Clients.Elasticsearch.Name transform_id)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpdateTransformRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpdateTransformRequest.g.cs
index c13b26c79e1..8d25676d9b1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpdateTransformRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpdateTransformRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class TransformUpdateTransformRequestParameters : RequestParameter
 		public bool? DeferValidation { get => Q<bool?>("defer_validation"); set => Q("defer_validation", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class TransformUpdateTransformRequest : PlainRequestBase<TransformUpdateTransformRequestParameters>
@@ -47,7 +47,7 @@ public TransformUpdateTransformRequest(Elastic.Clients.Elasticsearch.Id transfor
 		public bool? DeferValidation { get => Q<bool?>("defer_validation"); set => Q("defer_validation", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonInclude]
 		[JsonPropertyName("dest")]
@@ -59,7 +59,7 @@ public TransformUpdateTransformRequest(Elastic.Clients.Elasticsearch.Id transfor
 
 		[JsonInclude]
 		[JsonPropertyName("frequency")]
-		public Elastic.Clients.Elasticsearch.Time? Frequency { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Frequency { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("_meta")]
@@ -97,7 +97,7 @@ internal TransformUpdateTransformRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public TransformUpdateTransformRequestDescriptor<TDocument> DeferValidation(bool? deferValidation = true) => Qs("defer_validation", deferValidation);
-		public TransformUpdateTransformRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public TransformUpdateTransformRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public TransformUpdateTransformRequestDescriptor<TDocument> TransformId(Elastic.Clients.Elasticsearch.Id transform_id)
 		{
 			RouteValues.Required("transform_id", transform_id);
@@ -132,7 +132,7 @@ public TransformUpdateTransformRequestDescriptor<TDocument> TransformId(Elastic.
 
 		private Action<DestinationDescriptor> DestDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.TransformManagement.Settings? SettingsValue { get; set; }
 
@@ -248,7 +248,7 @@ public TransformUpdateTransformRequestDescriptor<TDocument> Dest(Action<Destinat
 			return Self;
 		}
 
-		public TransformUpdateTransformRequestDescriptor<TDocument> Frequency(Elastic.Clients.Elasticsearch.Time? frequency)
+		public TransformUpdateTransformRequestDescriptor<TDocument> Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
@@ -398,7 +398,7 @@ internal TransformUpdateTransformRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => true;
 		public TransformUpdateTransformRequestDescriptor DeferValidation(bool? deferValidation = true) => Qs("defer_validation", deferValidation);
-		public TransformUpdateTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public TransformUpdateTransformRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public TransformUpdateTransformRequestDescriptor TransformId(Elastic.Clients.Elasticsearch.Id transform_id)
 		{
 			RouteValues.Required("transform_id", transform_id);
@@ -433,7 +433,7 @@ public TransformUpdateTransformRequestDescriptor TransformId(Elastic.Clients.Ela
 
 		private Action<DestinationDescriptor> DestDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.TransformManagement.Settings? SettingsValue { get; set; }
 
@@ -549,7 +549,7 @@ public TransformUpdateTransformRequestDescriptor Dest(Action<DestinationDescript
 			return Self;
 		}
 
-		public TransformUpdateTransformRequestDescriptor Frequency(Elastic.Clients.Elasticsearch.Time? frequency)
+		public TransformUpdateTransformRequestDescriptor Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpdateTransformResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpdateTransformResponse.g.cs
index 73236260247..b607898e3ba 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpdateTransformResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpdateTransformResponse.g.cs
@@ -38,7 +38,7 @@ public sealed partial class TransformUpdateTransformResponse : ElasticsearchResp
 
 		[JsonInclude]
 		[JsonPropertyName("frequency")]
-		public Elastic.Clients.Elasticsearch.Time? Frequency { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? Frequency { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("id")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpgradeTransformsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpgradeTransformsRequest.g.cs
index 7548082e76d..df45ccbe3b9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpgradeTransformsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TransformManagement/TransformUpgradeTransformsRequest.g.cs
@@ -31,7 +31,7 @@ public sealed class TransformUpgradeTransformsRequestParameters : RequestParamet
 		public bool? DryRun { get => Q<bool?>("dry_run"); set => Q("dry_run", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public partial class TransformUpgradeTransformsRequest : PlainRequestBase<TransformUpgradeTransformsRequestParameters>
@@ -43,7 +43,7 @@ public partial class TransformUpgradeTransformsRequest : PlainRequestBase<Transf
 		public bool? DryRun { get => Q<bool?>("dry_run"); set => Q("dry_run", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 	}
 
 	public sealed partial class TransformUpgradeTransformsRequestDescriptor : RequestDescriptorBase<TransformUpgradeTransformsRequestDescriptor, TransformUpgradeTransformsRequestParameters>
@@ -57,7 +57,7 @@ public TransformUpgradeTransformsRequestDescriptor()
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		public TransformUpgradeTransformsRequestDescriptor DryRun(bool? dryRun = true) => Qs("dry_run", dryRun);
-		public TransformUpgradeTransformsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public TransformUpgradeTransformsRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 		}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs
index f69ac02756a..e39c9c8badb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs
@@ -67,19 +67,19 @@ public sealed class UpdateByQueryRequestParameters : RequestParameters<UpdateByQ
 		public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Scroll { get => Q<Elastic.Clients.Elasticsearch.Time?>("scroll"); set => Q("scroll", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
 		[JsonIgnore]
 		public long? ScrollSize { get => Q<long?>("scroll_size"); set => Q("scroll_size", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("search_timeout"); set => Q("search_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("search_timeout"); set => Q("search_timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
@@ -97,7 +97,7 @@ public sealed class UpdateByQueryRequestParameters : RequestParameters<UpdateByQ
 		public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public bool? Version { get => Q<bool?>("version"); set => Q("version", value); }
@@ -161,19 +161,19 @@ public UpdateByQueryRequest(Elastic.Clients.Elasticsearch.Indices indices) : bas
 		public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Scroll { get => Q<Elastic.Clients.Elasticsearch.Time?>("scroll"); set => Q("scroll", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
 		[JsonIgnore]
 		public long? ScrollSize { get => Q<long?>("scroll_size"); set => Q("scroll_size", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("search_timeout"); set => Q("search_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("search_timeout"); set => Q("search_timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
@@ -191,7 +191,7 @@ public UpdateByQueryRequest(Elastic.Clients.Elasticsearch.Indices indices) : bas
 		public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public bool? Version { get => Q<bool?>("version"); set => Q("version", value); }
@@ -253,17 +253,17 @@ internal UpdateByQueryRequestDescriptor()
 		public UpdateByQueryRequestDescriptor<TDocument> Preference(string? preference) => Qs("preference", preference);
 		public UpdateByQueryRequestDescriptor<TDocument> Refresh(bool? refresh = true) => Qs("refresh", refresh);
 		public UpdateByQueryRequestDescriptor<TDocument> RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache);
-		public UpdateByQueryRequestDescriptor<TDocument> RequestsPerSecond(long? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
+		public UpdateByQueryRequestDescriptor<TDocument> RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
 		public UpdateByQueryRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public UpdateByQueryRequestDescriptor<TDocument> Scroll(Elastic.Clients.Elasticsearch.Time? scroll) => Qs("scroll", scroll);
+		public UpdateByQueryRequestDescriptor<TDocument> Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll);
 		public UpdateByQueryRequestDescriptor<TDocument> ScrollSize(long? scrollSize) => Qs("scroll_size", scrollSize);
-		public UpdateByQueryRequestDescriptor<TDocument> SearchTimeout(Elastic.Clients.Elasticsearch.Time? searchTimeout) => Qs("search_timeout", searchTimeout);
+		public UpdateByQueryRequestDescriptor<TDocument> SearchTimeout(Elastic.Clients.Elasticsearch.Duration? searchTimeout) => Qs("search_timeout", searchTimeout);
 		public UpdateByQueryRequestDescriptor<TDocument> SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 		public UpdateByQueryRequestDescriptor<TDocument> Slices(Elastic.Clients.Elasticsearch.Slices? slices) => Qs("slices", slices);
 		public UpdateByQueryRequestDescriptor<TDocument> Sort(IEnumerable<string>? sort) => Qs("sort", sort);
 		public UpdateByQueryRequestDescriptor<TDocument> Stats(IEnumerable<string>? stats) => Qs("stats", stats);
 		public UpdateByQueryRequestDescriptor<TDocument> TerminateAfter(long? terminateAfter) => Qs("terminate_after", terminateAfter);
-		public UpdateByQueryRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public UpdateByQueryRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public UpdateByQueryRequestDescriptor<TDocument> Version(bool? version = true) => Qs("version", version);
 		public UpdateByQueryRequestDescriptor<TDocument> VersionType(bool? versionType = true) => Qs("version_type", versionType);
 		public UpdateByQueryRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
@@ -474,17 +474,17 @@ internal UpdateByQueryRequestDescriptor()
 		public UpdateByQueryRequestDescriptor Preference(string? preference) => Qs("preference", preference);
 		public UpdateByQueryRequestDescriptor Refresh(bool? refresh = true) => Qs("refresh", refresh);
 		public UpdateByQueryRequestDescriptor RequestCache(bool? requestCache = true) => Qs("request_cache", requestCache);
-		public UpdateByQueryRequestDescriptor RequestsPerSecond(long? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
+		public UpdateByQueryRequestDescriptor RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
 		public UpdateByQueryRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public UpdateByQueryRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Time? scroll) => Qs("scroll", scroll);
+		public UpdateByQueryRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Duration? scroll) => Qs("scroll", scroll);
 		public UpdateByQueryRequestDescriptor ScrollSize(long? scrollSize) => Qs("scroll_size", scrollSize);
-		public UpdateByQueryRequestDescriptor SearchTimeout(Elastic.Clients.Elasticsearch.Time? searchTimeout) => Qs("search_timeout", searchTimeout);
+		public UpdateByQueryRequestDescriptor SearchTimeout(Elastic.Clients.Elasticsearch.Duration? searchTimeout) => Qs("search_timeout", searchTimeout);
 		public UpdateByQueryRequestDescriptor SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 		public UpdateByQueryRequestDescriptor Slices(Elastic.Clients.Elasticsearch.Slices? slices) => Qs("slices", slices);
 		public UpdateByQueryRequestDescriptor Sort(IEnumerable<string>? sort) => Qs("sort", sort);
 		public UpdateByQueryRequestDescriptor Stats(IEnumerable<string>? stats) => Qs("stats", stats);
 		public UpdateByQueryRequestDescriptor TerminateAfter(long? terminateAfter) => Qs("terminate_after", terminateAfter);
-		public UpdateByQueryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public UpdateByQueryRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public UpdateByQueryRequestDescriptor Version(bool? version = true) => Qs("version", version);
 		public UpdateByQueryRequestDescriptor VersionType(bool? versionType = true) => Qs("version_type", versionType);
 		public UpdateByQueryRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs
index f4a808e4c00..00882efb4ce 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs
@@ -52,10 +52,18 @@ public sealed partial class UpdateByQueryResponse : ElasticsearchResponseBase
 		[JsonPropertyName("task")]
 		public Elastic.Clients.Elasticsearch.TaskId? Task { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("throttled")]
+		public Elastic.Clients.Elasticsearch.Duration? Throttled { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("throttled_millis")]
 		public long? ThrottledMillis { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("throttled_until")]
+		public Elastic.Clients.Elasticsearch.Duration? ThrottledUntil { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("throttled_until_millis")]
 		public long? ThrottledUntilMillis { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleRequest.g.cs
index 837492d7e7a..5cd8cff94cc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch
 	public sealed class UpdateByQueryRethrottleRequestParameters : RequestParameters<UpdateByQueryRethrottleRequestParameters>
 	{
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 	}
 
 	public partial class UpdateByQueryRethrottleRequest : PlainRequestBase<UpdateByQueryRethrottleRequestParameters>
@@ -41,7 +41,7 @@ public UpdateByQueryRethrottleRequest(Elastic.Clients.Elasticsearch.Id task_id)
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public long? RequestsPerSecond { get => Q<long?>("requests_per_second"); set => Q("requests_per_second", value); }
+		public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 	}
 
 	public sealed partial class UpdateByQueryRethrottleRequestDescriptor : RequestDescriptorBase<UpdateByQueryRethrottleRequestDescriptor, UpdateByQueryRethrottleRequestParameters>
@@ -58,7 +58,7 @@ internal UpdateByQueryRethrottleRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceUpdateByQueryRethrottle;
 		protected override HttpMethod HttpMethod => HttpMethod.POST;
 		protected override bool SupportsBody => false;
-		public UpdateByQueryRethrottleRequestDescriptor RequestsPerSecond(long? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
+		public UpdateByQueryRethrottleRequestDescriptor RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
 		public UpdateByQueryRethrottleRequestDescriptor TaskId(Elastic.Clients.Elasticsearch.Id task_id)
 		{
 			RouteValues.Required("task_id", task_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs
index 001539b8ba9..2e5e7601b44 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs
@@ -49,7 +49,7 @@ public sealed class UpdateRequestParameters : RequestParameters<UpdateRequestPar
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -95,7 +95,7 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie
 		public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("timeout"); set => Q("timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
 		[JsonIgnore]
 		public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
@@ -167,7 +167,7 @@ internal UpdateRequestDescriptor()
 		public UpdateRequestDescriptor<TDocument, TPartialDocument> RequireAlias(bool? requireAlias = true) => Qs("require_alias", requireAlias);
 		public UpdateRequestDescriptor<TDocument, TPartialDocument> RetryOnConflict(int? retryOnConflict) => Qs("retry_on_conflict", retryOnConflict);
 		public UpdateRequestDescriptor<TDocument, TPartialDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
-		public UpdateRequestDescriptor<TDocument, TPartialDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout) => Qs("timeout", timeout);
+		public UpdateRequestDescriptor<TDocument, TPartialDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 		public UpdateRequestDescriptor<TDocument, TPartialDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 		public UpdateRequestDescriptor<TDocument, TPartialDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Xpack/XpackUsageRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Xpack/XpackUsageRequest.g.cs
index cee29e28156..319cf8a12cd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Xpack/XpackUsageRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Xpack/XpackUsageRequest.g.cs
@@ -28,7 +28,7 @@ namespace Elastic.Clients.Elasticsearch.Xpack
 	public sealed class XpackUsageRequestParameters : RequestParameters<XpackUsageRequestParameters>
 	{
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public partial class XpackUsageRequest : PlainRequestBase<XpackUsageRequestParameters>
@@ -37,7 +37,7 @@ public partial class XpackUsageRequest : PlainRequestBase<XpackUsageRequestParam
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
 		[JsonIgnore]
-		public Elastic.Clients.Elasticsearch.Time? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Time?>("master_timeout"); set => Q("master_timeout", value); }
+		public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 	}
 
 	public sealed partial class XpackUsageRequestDescriptor : RequestDescriptorBase<XpackUsageRequestDescriptor, XpackUsageRequestParameters>
@@ -50,7 +50,7 @@ public XpackUsageRequestDescriptor()
 		internal override ApiUrls ApiUrls => ApiUrlsLookups.XpackUsage;
 		protected override HttpMethod HttpMethod => HttpMethod.GET;
 		protected override bool SupportsBody => false;
-		public XpackUsageRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Time? masterTimeout) => Qs("master_timeout", masterTimeout);
+		public XpackUsageRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
 		}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregation.g.cs
index 51806ea6250..ac199f38989 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregation.g.cs
@@ -85,7 +85,7 @@ public override AutoDateHistogramAggregation Read(ref Utf8JsonReader reader, Typ
 
 					if (reader.ValueTextEquals("missing"))
 					{
-						var value = JsonSerializer.Deserialize<string?>(ref reader, options);
+						var value = JsonSerializer.Deserialize<DateTimeOffset?>(ref reader, options);
 						if (value is not null)
 						{
 							agg.Missing = value;
@@ -225,10 +225,10 @@ public override void Write(Utf8JsonWriter writer, AutoDateHistogramAggregation v
 				JsonSerializer.Serialize(writer, value.Script, options);
 			}
 
-			if (!string.IsNullOrEmpty(value.TimeZone))
+			if (value.TimeZone is not null)
 			{
 				writer.WritePropertyName("time_zone");
-				writer.WriteStringValue(value.TimeZone);
+				JsonSerializer.Serialize(writer, value.TimeZone, options);
 			}
 
 			writer.WriteEndObject();
@@ -273,7 +273,7 @@ public AutoDateHistogramAggregation(string name) : base(name)
 
 		[JsonInclude]
 		[JsonPropertyName("missing")]
-		public string? Missing { get; set; }
+		public DateTimeOffset? Missing { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("offset")]
@@ -321,7 +321,7 @@ public AutoDateHistogramAggregationDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.Aggregations.MinimumInterval? MinimumIntervalValue { get; set; }
 
-		private string? MissingValue { get; set; }
+		private DateTimeOffset? MissingValue { get; set; }
 
 		private string? OffsetValue { get; set; }
 
@@ -413,7 +413,7 @@ public AutoDateHistogramAggregationDescriptor<TDocument> MinimumInterval(Elastic
 			return Self;
 		}
 
-		public AutoDateHistogramAggregationDescriptor<TDocument> Missing(string? missing)
+		public AutoDateHistogramAggregationDescriptor<TDocument> Missing(DateTimeOffset? missing)
 		{
 			MissingValue = missing;
 			return Self;
@@ -500,10 +500,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				JsonSerializer.Serialize(writer, ParamsValue, options);
 			}
 
-			if (!string.IsNullOrEmpty(TimeZoneValue))
+			if (TimeZoneValue is not null)
 			{
 				writer.WritePropertyName("time_zone");
-				writer.WriteStringValue(TimeZoneValue);
+				JsonSerializer.Serialize(writer, TimeZoneValue, options);
 			}
 
 			writer.WriteEndObject();
@@ -562,7 +562,7 @@ public AutoDateHistogramAggregationDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.Aggregations.MinimumInterval? MinimumIntervalValue { get; set; }
 
-		private string? MissingValue { get; set; }
+		private DateTimeOffset? MissingValue { get; set; }
 
 		private string? OffsetValue { get; set; }
 
@@ -660,7 +660,7 @@ public AutoDateHistogramAggregationDescriptor MinimumInterval(Elastic.Clients.El
 			return Self;
 		}
 
-		public AutoDateHistogramAggregationDescriptor Missing(string? missing)
+		public AutoDateHistogramAggregationDescriptor Missing(DateTimeOffset? missing)
 		{
 			MissingValue = missing;
 			return Self;
@@ -747,10 +747,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				JsonSerializer.Serialize(writer, ParamsValue, options);
 			}
 
-			if (!string.IsNullOrEmpty(TimeZoneValue))
+			if (TimeZoneValue is not null)
 			{
 				writer.WritePropertyName("time_zone");
-				writer.WriteStringValue(TimeZoneValue);
+				JsonSerializer.Serialize(writer, TimeZoneValue, options);
 			}
 
 			writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs
index 96932ca9ba8..750f7d1aba7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs
@@ -63,7 +63,7 @@ public override DateHistogramAggregation Read(ref Utf8JsonReader reader, Type ty
 
 					if (reader.ValueTextEquals("fixed_interval"))
 					{
-						var value = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Time?>(ref reader, options);
+						var value = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
 						if (value is not null)
 						{
 							agg.FixedInterval = value;
@@ -83,17 +83,6 @@ public override DateHistogramAggregation Read(ref Utf8JsonReader reader, Type ty
 						continue;
 					}
 
-					if (reader.ValueTextEquals("interval"))
-					{
-						var value = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Time?>(ref reader, options);
-						if (value is not null)
-						{
-							agg.Interval = value;
-						}
-
-						continue;
-					}
-
 					if (reader.ValueTextEquals("min_doc_count"))
 					{
 						var value = JsonSerializer.Deserialize<int?>(ref reader, options);
@@ -107,7 +96,7 @@ public override DateHistogramAggregation Read(ref Utf8JsonReader reader, Type ty
 
 					if (reader.ValueTextEquals("missing"))
 					{
-						var value = JsonSerializer.Deserialize<string?>(ref reader, options);
+						var value = JsonSerializer.Deserialize<DateTimeOffset?>(ref reader, options);
 						if (value is not null)
 						{
 							agg.Missing = value;
@@ -118,7 +107,7 @@ public override DateHistogramAggregation Read(ref Utf8JsonReader reader, Type ty
 
 					if (reader.ValueTextEquals("offset"))
 					{
-						var value = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Time?>(ref reader, options);
+						var value = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.Duration?>(ref reader, options);
 						if (value is not null)
 						{
 							agg.Offset = value;
@@ -234,12 +223,6 @@ public override void Write(Utf8JsonWriter writer, DateHistogramAggregation value
 				writer.WriteStringValue(value.Format);
 			}
 
-			if (value.Interval is not null)
-			{
-				writer.WritePropertyName("interval");
-				JsonSerializer.Serialize(writer, value.Interval, options);
-			}
-
 			if (value.MinDocCount.HasValue)
 			{
 				writer.WritePropertyName("min_doc_count");
@@ -276,10 +259,10 @@ public override void Write(Utf8JsonWriter writer, DateHistogramAggregation value
 				JsonSerializer.Serialize(writer, value.Script, options);
 			}
 
-			if (!string.IsNullOrEmpty(value.TimeZone))
+			if (value.TimeZone is not null)
 			{
 				writer.WritePropertyName("time_zone");
-				writer.WriteStringValue(value.TimeZone);
+				JsonSerializer.Serialize(writer, value.TimeZone, options);
 			}
 
 			writer.WriteEndObject();
@@ -316,27 +299,23 @@ public DateHistogramAggregation(string name) : base(name)
 
 		[JsonInclude]
 		[JsonPropertyName("fixed_interval")]
-		public Elastic.Clients.Elasticsearch.Time? FixedInterval { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? FixedInterval { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("format")]
 		public string? Format { get; set; }
 
-		[JsonInclude]
-		[JsonPropertyName("interval")]
-		public Elastic.Clients.Elasticsearch.Time? Interval { get; set; }
-
 		[JsonInclude]
 		[JsonPropertyName("min_doc_count")]
 		public int? MinDocCount { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("missing")]
-		public string? Missing { get; set; }
+		public DateTimeOffset? Missing { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("offset")]
-		public Elastic.Clients.Elasticsearch.Time? Offset { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Offset { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("order")]
@@ -378,19 +357,17 @@ public DateHistogramAggregationDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FixedIntervalValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FixedIntervalValue { get; set; }
 
 		private string? FormatValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? IntervalValue { get; set; }
-
 		private Dictionary<string, object>? MetaValue { get; set; }
 
 		private int? MinDocCountValue { get; set; }
 
-		private string? MissingValue { get; set; }
+		private DateTimeOffset? MissingValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? OffsetValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? OffsetValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.Aggregations.HistogramOrder? OrderValue { get; set; }
 
@@ -468,7 +445,7 @@ public DateHistogramAggregationDescriptor<TDocument> Field<TValue>(Expression<Fu
 			return Self;
 		}
 
-		public DateHistogramAggregationDescriptor<TDocument> FixedInterval(Elastic.Clients.Elasticsearch.Time? fixedInterval)
+		public DateHistogramAggregationDescriptor<TDocument> FixedInterval(Elastic.Clients.Elasticsearch.Duration? fixedInterval)
 		{
 			FixedIntervalValue = fixedInterval;
 			return Self;
@@ -480,12 +457,6 @@ public DateHistogramAggregationDescriptor<TDocument> Format(string? format)
 			return Self;
 		}
 
-		public DateHistogramAggregationDescriptor<TDocument> Interval(Elastic.Clients.Elasticsearch.Time? interval)
-		{
-			IntervalValue = interval;
-			return Self;
-		}
-
 		public DateHistogramAggregationDescriptor<TDocument> Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 		{
 			MetaValue = selector?.Invoke(new FluentDictionary<string, object>());
@@ -498,13 +469,13 @@ public DateHistogramAggregationDescriptor<TDocument> MinDocCount(int? minDocCoun
 			return Self;
 		}
 
-		public DateHistogramAggregationDescriptor<TDocument> Missing(string? missing)
+		public DateHistogramAggregationDescriptor<TDocument> Missing(DateTimeOffset? missing)
 		{
 			MissingValue = missing;
 			return Self;
 		}
 
-		public DateHistogramAggregationDescriptor<TDocument> Offset(Elastic.Clients.Elasticsearch.Time? offset)
+		public DateHistogramAggregationDescriptor<TDocument> Offset(Elastic.Clients.Elasticsearch.Duration? offset)
 		{
 			OffsetValue = offset;
 			return Self;
@@ -591,12 +562,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				writer.WriteStringValue(FormatValue);
 			}
 
-			if (IntervalValue is not null)
-			{
-				writer.WritePropertyName("interval");
-				JsonSerializer.Serialize(writer, IntervalValue, options);
-			}
-
 			if (MinDocCountValue.HasValue)
 			{
 				writer.WritePropertyName("min_doc_count");
@@ -637,10 +602,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				JsonSerializer.Serialize(writer, ParamsValue, options);
 			}
 
-			if (!string.IsNullOrEmpty(TimeZoneValue))
+			if (TimeZoneValue is not null)
 			{
 				writer.WritePropertyName("time_zone");
-				writer.WriteStringValue(TimeZoneValue);
+				JsonSerializer.Serialize(writer, TimeZoneValue, options);
 			}
 
 			writer.WriteEndObject();
@@ -693,19 +658,17 @@ public DateHistogramAggregationDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? FixedIntervalValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FixedIntervalValue { get; set; }
 
 		private string? FormatValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? IntervalValue { get; set; }
-
 		private Dictionary<string, object>? MetaValue { get; set; }
 
 		private int? MinDocCountValue { get; set; }
 
-		private string? MissingValue { get; set; }
+		private DateTimeOffset? MissingValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? OffsetValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? OffsetValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.Aggregations.HistogramOrder? OrderValue { get; set; }
 
@@ -789,7 +752,7 @@ public DateHistogramAggregationDescriptor Field<TDocument>(Expression<Func<TDocu
 			return Self;
 		}
 
-		public DateHistogramAggregationDescriptor FixedInterval(Elastic.Clients.Elasticsearch.Time? fixedInterval)
+		public DateHistogramAggregationDescriptor FixedInterval(Elastic.Clients.Elasticsearch.Duration? fixedInterval)
 		{
 			FixedIntervalValue = fixedInterval;
 			return Self;
@@ -801,12 +764,6 @@ public DateHistogramAggregationDescriptor Format(string? format)
 			return Self;
 		}
 
-		public DateHistogramAggregationDescriptor Interval(Elastic.Clients.Elasticsearch.Time? interval)
-		{
-			IntervalValue = interval;
-			return Self;
-		}
-
 		public DateHistogramAggregationDescriptor Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 		{
 			MetaValue = selector?.Invoke(new FluentDictionary<string, object>());
@@ -819,13 +776,13 @@ public DateHistogramAggregationDescriptor MinDocCount(int? minDocCount)
 			return Self;
 		}
 
-		public DateHistogramAggregationDescriptor Missing(string? missing)
+		public DateHistogramAggregationDescriptor Missing(DateTimeOffset? missing)
 		{
 			MissingValue = missing;
 			return Self;
 		}
 
-		public DateHistogramAggregationDescriptor Offset(Elastic.Clients.Elasticsearch.Time? offset)
+		public DateHistogramAggregationDescriptor Offset(Elastic.Clients.Elasticsearch.Duration? offset)
 		{
 			OffsetValue = offset;
 			return Self;
@@ -912,12 +869,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				writer.WriteStringValue(FormatValue);
 			}
 
-			if (IntervalValue is not null)
-			{
-				writer.WritePropertyName("interval");
-				JsonSerializer.Serialize(writer, IntervalValue, options);
-			}
-
 			if (MinDocCountValue.HasValue)
 			{
 				writer.WritePropertyName("min_doc_count");
@@ -958,10 +909,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				JsonSerializer.Serialize(writer, ParamsValue, options);
 			}
 
-			if (!string.IsNullOrEmpty(TimeZoneValue))
+			if (TimeZoneValue is not null)
 			{
 				writer.WritePropertyName("time_zone");
-				writer.WriteStringValue(TimeZoneValue);
+				JsonSerializer.Serialize(writer, TimeZoneValue, options);
 			}
 
 			writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramBucket.g.cs
index 133428dfe61..dd0047d7b9e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramBucket.g.cs
@@ -37,7 +37,7 @@ public DateHistogramBucket(IReadOnlyDictionary<string, AggregateBase> backingDic
 
 		[JsonInclude]
 		[JsonPropertyName("key")]
-		public Elastic.Clients.Elasticsearch.EpochMillis Key { get; init; }
+		public long Key { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("key_as_string")]
@@ -52,7 +52,7 @@ internal sealed class DateHistogramBucketConverter : JsonConverter<DateHistogram
 				throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
 			var subAggs = new Dictionary<string, AggregateBase>(); // TODO - Optimise this and only create if we need it.
 			long docCount = default;
-			Elastic.Clients.Elasticsearch.EpochMillis key = default;
+			long key = default;
 			string? keyAsString = default;
 			while (reader.Read())
 			{
@@ -70,7 +70,7 @@ internal sealed class DateHistogramBucketConverter : JsonConverter<DateHistogram
 
 				if (name.Equals("key", StringComparison.Ordinal))
 				{
-					key = JsonSerializer.Deserialize<Elastic.Clients.Elasticsearch.EpochMillis>(ref reader, options);
+					key = JsonSerializer.Deserialize<long>(ref reader, options);
 					continue;
 				}
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregation.g.cs
index 8e8d7a1fe6c..74f4a78d88f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregation.g.cs
@@ -140,10 +140,10 @@ public override void Write(Utf8JsonWriter writer, DateRangeAggregation value, Js
 				JsonSerializer.Serialize(writer, value.Ranges, options);
 			}
 
-			if (!string.IsNullOrEmpty(value.TimeZone))
+			if (value.TimeZone is not null)
 			{
 				writer.WritePropertyName("time_zone");
-				writer.WriteStringValue(value.TimeZone);
+				JsonSerializer.Serialize(writer, value.TimeZone, options);
 			}
 
 			writer.WriteEndObject();
@@ -350,10 +350,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				JsonSerializer.Serialize(writer, RangesValue, options);
 			}
 
-			if (!string.IsNullOrEmpty(TimeZoneValue))
+			if (TimeZoneValue is not null)
 			{
 				writer.WritePropertyName("time_zone");
-				writer.WriteStringValue(TimeZoneValue);
+				JsonSerializer.Serialize(writer, TimeZoneValue, options);
 			}
 
 			writer.WriteEndObject();
@@ -552,10 +552,10 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 				JsonSerializer.Serialize(writer, RangesValue, options);
 			}
 
-			if (!string.IsNullOrEmpty(TimeZoneValue))
+			if (TimeZoneValue is not null)
 			{
 				writer.WritePropertyName("time_zone");
-				writer.WriteStringValue(TimeZoneValue);
+				JsonSerializer.Serialize(writer, TimeZoneValue, options);
 			}
 
 			writer.WriteEndObject();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkStats.g.cs
index 341e7881481..656134a6ba3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkStats.g.cs
@@ -36,7 +36,7 @@ public partial class BulkStats
 
 		[JsonInclude]
 		[JsonPropertyName("avg_time")]
-		public string? AvgTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? AvgTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("avg_time_in_millis")]
@@ -56,7 +56,7 @@ public partial class BulkStats
 
 		[JsonInclude]
 		[JsonPropertyName("total_time")]
-		public string? TotalTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? TotalTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_time_in_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/AutoFollowedCluster.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/AutoFollowedCluster.g.cs
index 305972342eb..c25c524139d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/AutoFollowedCluster.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/AutoFollowedCluster.g.cs
@@ -36,6 +36,6 @@ public partial class AutoFollowedCluster
 
 		[JsonInclude]
 		[JsonPropertyName("time_since_last_check_millis")]
-		public string TimeSinceLastCheckMillis { get; init; }
+		public long TimeSinceLastCheckMillis { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/FollowerIndex.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/FollowerIndex.g.cs
index c6eed919798..6fb0186bd80 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/FollowerIndex.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/FollowerIndex.g.cs
@@ -26,10 +26,6 @@ namespace Elastic.Clients.Elasticsearch.Ccr
 {
 	public partial class FollowerIndex
 	{
-		[JsonInclude]
-		[JsonPropertyName("follower_index")]
-		public string FollowerIndexTemp { get; init; }
-
 		[JsonInclude]
 		[JsonPropertyName("leader_index")]
 		public string LeaderIndex { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/FollowerIndexParameters.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/FollowerIndexParameters.g.cs
index 5d9d732bb56..c490435d579 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/FollowerIndexParameters.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/FollowerIndexParameters.g.cs
@@ -44,7 +44,7 @@ public partial class FollowerIndexParameters
 
 		[JsonInclude]
 		[JsonPropertyName("max_retry_delay")]
-		public Elastic.Clients.Elasticsearch.Time MaxRetryDelay { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration MaxRetryDelay { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("max_write_buffer_count")]
@@ -64,6 +64,6 @@ public partial class FollowerIndexParameters
 
 		[JsonInclude]
 		[JsonPropertyName("read_poll_timeout")]
-		public Elastic.Clients.Elasticsearch.Time ReadPollTimeout { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration ReadPollTimeout { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/ShardStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/ShardStats.g.cs
index 4a21d579fe0..cb92687a93d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/ShardStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ccr/ShardStats.g.cs
@@ -118,21 +118,37 @@ public partial class ShardStats
 		[JsonPropertyName("successful_write_requests")]
 		public long SuccessfulWriteRequests { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("time_since_last_read")]
+		public Elastic.Clients.Elasticsearch.Duration? TimeSinceLastRead { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("time_since_last_read_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis TimeSinceLastReadMillis { get; init; }
+		public long TimeSinceLastReadMillis { get; init; }
+
+		[JsonInclude]
+		[JsonPropertyName("total_read_remote_exec_time")]
+		public Elastic.Clients.Elasticsearch.Duration? TotalReadRemoteExecTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_read_remote_exec_time_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis TotalReadRemoteExecTimeMillis { get; init; }
+		public long TotalReadRemoteExecTimeMillis { get; init; }
+
+		[JsonInclude]
+		[JsonPropertyName("total_read_time")]
+		public Elastic.Clients.Elasticsearch.Duration? TotalReadTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_read_time_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis TotalReadTimeMillis { get; init; }
+		public long TotalReadTimeMillis { get; init; }
+
+		[JsonInclude]
+		[JsonPropertyName("total_write_time")]
+		public Elastic.Clients.Elasticsearch.Duration? TotalWriteTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_write_time_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis TotalWriteTimeMillis { get; init; }
+		public long TotalWriteTimeMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("write_buffer_operation_count")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/CharFilterTypes.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/CharFilterTypes.g.cs
index 117def7a6b1..b748c855f4b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/CharFilterTypes.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/CharFilterTypes.g.cs
@@ -46,10 +46,6 @@ public partial class CharFilterTypes
 		[JsonPropertyName("built_in_tokenizers")]
 		public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.FieldTypes> BuiltInTokenizers { get; init; }
 
-		[JsonInclude]
-		[JsonPropertyName("char_filter_types")]
-		public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.FieldTypes> CharFilterTypesTemp { get; init; }
-
 		[JsonInclude]
 		[JsonPropertyName("filter_types")]
 		public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Cluster.FieldTypes> FilterTypes { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ClusterProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ClusterProcessor.g.cs
index 3abdfac1589..beb47ce98b0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ClusterProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ClusterProcessor.g.cs
@@ -38,6 +38,10 @@ public partial class ClusterProcessor
 		[JsonPropertyName("failed")]
 		public long Failed { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("time")]
+		public Elastic.Clients.Elasticsearch.Duration? Time { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("time_in_millis")]
 		public long TimeInMillis { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplate.g.cs
index 55f4c21d45d..345d64bd6f9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplate.g.cs
@@ -26,10 +26,6 @@ namespace Elastic.Clients.Elasticsearch.Cluster
 {
 	public partial class ComponentTemplate
 	{
-		[JsonInclude]
-		[JsonPropertyName("component_template")]
-		public Elastic.Clients.Elasticsearch.Cluster.ComponentTemplateNode ComponentTemplateTemp { get; init; }
-
 		[JsonInclude]
 		[JsonPropertyName("name")]
 		public string Name { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplateNode.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplateNode.g.cs
deleted file mode 100644
index b1837d764de..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplateNode.g.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-//
-// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
-// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
-// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
-// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
-// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
-// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
-// ------------------------------------------------
-//
-// This file is automatically generated.
-// Please do not edit these files manually.
-//
-// ------------------------------------------------
-
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#nullable restore
-namespace Elastic.Clients.Elasticsearch.Cluster
-{
-	public partial class ComponentTemplateNode
-	{
-		[JsonInclude]
-		[JsonPropertyName("_meta")]
-		public Dictionary<string, object>? Meta { get; init; }
-
-		[JsonInclude]
-		[JsonPropertyName("template")]
-		public Elastic.Clients.Elasticsearch.Cluster.ComponentTemplateSummary Template { get; init; }
-
-		[JsonInclude]
-		[JsonPropertyName("version")]
-		public long? Version { get; init; }
-	}
-}
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplateSummary.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplateSummary.g.cs
deleted file mode 100644
index 50b1e3916f7..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ComponentTemplateSummary.g.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-//
-// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
-// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
-// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
-// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
-// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
-// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
-// ------------------------------------------------
-//
-// This file is automatically generated.
-// Please do not edit these files manually.
-//
-// ------------------------------------------------
-
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#nullable restore
-namespace Elastic.Clients.Elasticsearch.Cluster
-{
-	public partial class ComponentTemplateSummary
-	{
-		[JsonInclude]
-		[JsonPropertyName("_meta")]
-		public Dictionary<string, object>? Meta { get; init; }
-
-		[JsonInclude]
-		[JsonPropertyName("aliases")]
-		public Dictionary<string, Elastic.Clients.Elasticsearch.IndexManagement.AliasDefinition>? Aliases { get; init; }
-
-		[JsonInclude]
-		[JsonPropertyName("mappings")]
-		public Elastic.Clients.Elasticsearch.Mapping.TypeMapping? Mappings { get; init; }
-
-		[JsonInclude]
-		[JsonPropertyName("settings")]
-		public Dictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings> Settings { get; init; }
-
-		[JsonInclude]
-		[JsonPropertyName("version")]
-		public long? Version { get; init; }
-	}
-}
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/PendingTask.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/PendingTask.g.cs
index d6e9a229c91..f60a609649e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/PendingTask.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/PendingTask.g.cs
@@ -44,10 +44,10 @@ public partial class PendingTask
 
 		[JsonInclude]
 		[JsonPropertyName("time_in_queue")]
-		public string TimeInQueue { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? TimeInQueue { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("time_in_queue_millis")]
-		public int TimeInQueueMillis { get; init; }
+		public long TimeInQueueMillis { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/UnassignedInformation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/UnassignedInformation.g.cs
index 2a37d78067c..d089f9fb532 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/UnassignedInformation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/UnassignedInformation.g.cs
@@ -32,7 +32,7 @@ public partial class UnassignedInformation
 
 		[JsonInclude]
 		[JsonPropertyName("at")]
-		public string At { get; init; }
+		public DateTimeOffset At { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("delayed")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/DanglingIndices/DanglingIndex.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/DanglingIndices/DanglingIndex.g.cs
index 01e7e55ccda..6e69a846a05 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/DanglingIndices/DanglingIndex.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/DanglingIndices/DanglingIndex.g.cs
@@ -28,7 +28,7 @@ public partial class DanglingIndex
 	{
 		[JsonInclude]
 		[JsonPropertyName("creation_date_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis CreationDateMillis { get; init; }
+		public long CreationDateMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("index_name")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/DateOrEpochMillis.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/DateOrEpochMillis.g.cs
deleted file mode 100644
index bb9d372017b..00000000000
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/DateOrEpochMillis.g.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information.
-//
-// ███╗   ██╗ ██████╗ ████████╗██╗ ██████╗███████╗
-// ████╗  ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝
-// ██╔██╗ ██║██║   ██║   ██║   ██║██║     █████╗
-// ██║╚██╗██║██║   ██║   ██║   ██║██║     ██╔══╝
-// ██║ ╚████║╚██████╔╝   ██║   ██║╚██████╗███████╗
-// ╚═╝  ╚═══╝ ╚═════╝    ╚═╝   ╚═╝ ╚═════╝╚══════╝
-// ------------------------------------------------
-//
-// This file is automatically generated.
-// Please do not edit these files manually.
-//
-// ------------------------------------------------
-
-using Elastic.Transport;
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#nullable restore
-namespace Elastic.Clients.Elasticsearch
-{
-	public partial class DateOrEpochMillis : Union<string?, Elastic.Clients.Elasticsearch.EpochMillis?>
-	{
-		public DateOrEpochMillis(string? item) : base(item)
-		{
-		}
-
-		public DateOrEpochMillis(Elastic.Clients.Elasticsearch.EpochMillis? item) : base(item)
-		{
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ElasticsearchVersionInfo.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ElasticsearchVersionInfo.g.cs
index aff88406b51..3d7bac91ab4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ElasticsearchVersionInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ElasticsearchVersionInfo.g.cs
@@ -28,7 +28,7 @@ public partial class ElasticsearchVersionInfo
 	{
 		[JsonInclude]
 		[JsonPropertyName("build_date")]
-		public string BuildDate { get; init; }
+		public DateTimeOffset BuildDate { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("build_flavor")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FlushStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FlushStats.g.cs
index 49a9e50cf45..6161baaf36f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FlushStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FlushStats.g.cs
@@ -36,7 +36,7 @@ public partial class FlushStats
 
 		[JsonInclude]
 		[JsonPropertyName("total_time")]
-		public string? TotalTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? TotalTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_time_in_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GetStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GetStats.g.cs
index 4fc16ca446e..4ec21995ab8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GetStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GetStats.g.cs
@@ -32,7 +32,7 @@ public partial class GetStats
 
 		[JsonInclude]
 		[JsonPropertyName("exists_time")]
-		public string? ExistsTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? ExistsTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("exists_time_in_millis")]
@@ -44,7 +44,7 @@ public partial class GetStats
 
 		[JsonInclude]
 		[JsonPropertyName("missing_time")]
-		public string? MissingTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? MissingTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("missing_time_in_millis")]
@@ -56,7 +56,7 @@ public partial class GetStats
 
 		[JsonInclude]
 		[JsonPropertyName("time")]
-		public string? Time { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? Time { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("time_in_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Graph/ExploreControls.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Graph/ExploreControls.g.cs
index de678ed853c..6ef7c66ecc0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Graph/ExploreControls.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Graph/ExploreControls.g.cs
@@ -36,7 +36,7 @@ public partial class ExploreControls
 
 		[JsonInclude]
 		[JsonPropertyName("timeout")]
-		public Elastic.Clients.Elasticsearch.Time? Timeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Timeout { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("use_significance")]
@@ -58,7 +58,7 @@ public ExploreControlsDescriptor() : base()
 
 		private int? SampleSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? TimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; }
 
 		private bool UseSignificanceValue { get; set; }
 
@@ -92,7 +92,7 @@ public ExploreControlsDescriptor<TDocument> SampleSize(int? sampleSize)
 			return Self;
 		}
 
-		public ExploreControlsDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Time? timeout)
+		public ExploreControlsDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout)
 		{
 			TimeoutValue = timeout;
 			return Self;
@@ -156,7 +156,7 @@ public ExploreControlsDescriptor() : base()
 
 		private int? SampleSizeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? TimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; }
 
 		private bool UseSignificanceValue { get; set; }
 
@@ -190,7 +190,7 @@ public ExploreControlsDescriptor SampleSize(int? sampleSize)
 			return Self;
 		}
 
-		public ExploreControlsDescriptor Timeout(Elastic.Clients.Elasticsearch.Time? timeout)
+		public ExploreControlsDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout)
 		{
 			TimeoutValue = timeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/LifecycleExplainManaged.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/LifecycleExplainManaged.g.cs
index 1b76e5063e0..5b3e234f767 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/LifecycleExplainManaged.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/LifecycleExplainManaged.g.cs
@@ -28,15 +28,19 @@ public partial class LifecycleExplainManaged : ILifecycleExplain
 	{
 		[JsonInclude]
 		[JsonPropertyName("action")]
-		public string Action { get; init; }
+		public string? Action { get; init; }
+
+		[JsonInclude]
+		[JsonPropertyName("action_time")]
+		public DateTimeOffset? ActionTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("action_time_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis ActionTimeMillis { get; init; }
+		public long? ActionTimeMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("age")]
-		public Elastic.Clients.Elasticsearch.Time Age { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? Age { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("failed_step")]
@@ -48,19 +52,27 @@ public partial class LifecycleExplainManaged : ILifecycleExplain
 
 		[JsonInclude]
 		[JsonPropertyName("index")]
-		public string Index { get; init; }
+		public string? Index { get; init; }
+
+		[JsonInclude]
+		[JsonPropertyName("index_creation_date")]
+		public DateTimeOffset? IndexCreationDate { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("index_creation_date_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? IndexCreationDateMillis { get; init; }
+		public long? IndexCreationDateMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("is_auto_retryable_error")]
 		public bool? IsAutoRetryableError { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("lifecycle_date")]
+		public DateTimeOffset? LifecycleDate { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("lifecycle_date_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis LifecycleDateMillis { get; init; }
+		public long? LifecycleDateMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("managed")]
@@ -71,11 +83,15 @@ public partial class LifecycleExplainManaged : ILifecycleExplain
 
 		[JsonInclude]
 		[JsonPropertyName("phase_execution")]
-		public Elastic.Clients.Elasticsearch.Ilm.LifecycleExplainPhaseExecution PhaseExecution { get; init; }
+		public Elastic.Clients.Elasticsearch.Ilm.LifecycleExplainPhaseExecution? PhaseExecution { get; init; }
+
+		[JsonInclude]
+		[JsonPropertyName("phase_time")]
+		public DateTimeOffset? PhaseTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("phase_time_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis PhaseTimeMillis { get; init; }
+		public long? PhaseTimeMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("policy")]
@@ -83,18 +99,22 @@ public partial class LifecycleExplainManaged : ILifecycleExplain
 
 		[JsonInclude]
 		[JsonPropertyName("step")]
-		public string Step { get; init; }
+		public string? Step { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("step_info")]
 		public Dictionary<string, object>? StepInfo { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("step_time")]
+		public DateTimeOffset? StepTime { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("step_time_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis StepTimeMillis { get; init; }
+		public long? StepTimeMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("time_since_index_creation")]
-		public Elastic.Clients.Elasticsearch.Time? TimeSinceIndexCreation { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? TimeSinceIndexCreation { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/LifecycleExplainPhaseExecution.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/LifecycleExplainPhaseExecution.g.cs
index 3cb871ee12e..4c64d5311d0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/LifecycleExplainPhaseExecution.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/LifecycleExplainPhaseExecution.g.cs
@@ -28,7 +28,7 @@ public partial class LifecycleExplainPhaseExecution
 	{
 		[JsonInclude]
 		[JsonPropertyName("modified_date_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis ModifiedDateInMillis { get; init; }
+		public long ModifiedDateInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("policy")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/Phase.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/Phase.g.cs
index d94bd22be15..19f181ca2bb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/Phase.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ilm/Phase.g.cs
@@ -36,6 +36,6 @@ public partial class Phase
 
 		[JsonInclude]
 		[JsonPropertyName("min_age")]
-		public Elastic.Clients.Elasticsearch.Time? MinAge { get; init; }
+		public Union<Elastic.Clients.Elasticsearch.Duration?, long?>? MinAge { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettings.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettings.g.cs
index 44d90fc7614..ee6377f56f6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettings.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettings.g.cs
@@ -52,11 +52,12 @@ public partial class IndexSettings
 
 		[JsonInclude]
 		[JsonPropertyName("creation_date")]
-		public string? CreationDate { get; set; }
+		[JsonConverter(typeof(StringifiedLongConverter))]
+		public long? CreationDate { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("creation_date_string")]
-		public string? CreationDateString { get; set; }
+		public DateTimeOffset? CreationDateString { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("default_pipeline")]
@@ -72,7 +73,7 @@ public partial class IndexSettings
 
 		[JsonInclude]
 		[JsonPropertyName("gc_deletes")]
-		public Elastic.Clients.Elasticsearch.Time? GcDeletes { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? GcDeletes { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("hidden")]
@@ -188,7 +189,7 @@ public partial class IndexSettings
 
 		[JsonInclude]
 		[JsonPropertyName("refresh_interval")]
-		public Elastic.Clients.Elasticsearch.Time? RefreshInterval { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? RefreshInterval { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("routing")]
@@ -304,9 +305,9 @@ public IndexSettingsDescriptor() : base()
 
 		private string? CodecValue { get; set; }
 
-		private string? CreationDateValue { get; set; }
+		private long? CreationDateValue { get; set; }
 
-		private string? CreationDateStringValue { get; set; }
+		private DateTimeOffset? CreationDateStringValue { get; set; }
 
 		private string? DefaultPipelineValue { get; set; }
 
@@ -314,7 +315,7 @@ public IndexSettingsDescriptor() : base()
 
 		private Union<string?, int?>? FormatValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? GcDeletesValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? GcDeletesValue { get; set; }
 
 		private Union<bool?, string?>? HiddenValue { get; set; }
 
@@ -402,7 +403,7 @@ public IndexSettingsDescriptor() : base()
 
 		private Action<SettingsQueryStringDescriptor> QueryStringDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? RefreshIntervalValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? RefreshIntervalValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.IndexManagement.IndexRouting? RoutingValue { get; set; }
 
@@ -626,13 +627,13 @@ public IndexSettingsDescriptor<TDocument> Codec(string? codec)
 			return Self;
 		}
 
-		public IndexSettingsDescriptor<TDocument> CreationDate(string? creationDate)
+		public IndexSettingsDescriptor<TDocument> CreationDate(long? creationDate)
 		{
 			CreationDateValue = creationDate;
 			return Self;
 		}
 
-		public IndexSettingsDescriptor<TDocument> CreationDateString(string? creationDateString)
+		public IndexSettingsDescriptor<TDocument> CreationDateString(DateTimeOffset? creationDateString)
 		{
 			CreationDateStringValue = creationDateString;
 			return Self;
@@ -656,7 +657,7 @@ public IndexSettingsDescriptor<TDocument> Format(Union<string?, int?>? format)
 			return Self;
 		}
 
-		public IndexSettingsDescriptor<TDocument> GcDeletes(Elastic.Clients.Elasticsearch.Time? gcDeletes)
+		public IndexSettingsDescriptor<TDocument> GcDeletes(Elastic.Clients.Elasticsearch.Duration? gcDeletes)
 		{
 			GcDeletesValue = gcDeletes;
 			return Self;
@@ -968,7 +969,7 @@ public IndexSettingsDescriptor<TDocument> QueryString(Action<SettingsQueryString
 			return Self;
 		}
 
-		public IndexSettingsDescriptor<TDocument> RefreshInterval(Elastic.Clients.Elasticsearch.Time? refreshInterval)
+		public IndexSettingsDescriptor<TDocument> RefreshInterval(Elastic.Clients.Elasticsearch.Duration? refreshInterval)
 		{
 			RefreshIntervalValue = refreshInterval;
 			return Self;
@@ -1820,9 +1821,9 @@ public IndexSettingsDescriptor() : base()
 
 		private string? CodecValue { get; set; }
 
-		private string? CreationDateValue { get; set; }
+		private long? CreationDateValue { get; set; }
 
-		private string? CreationDateStringValue { get; set; }
+		private DateTimeOffset? CreationDateStringValue { get; set; }
 
 		private string? DefaultPipelineValue { get; set; }
 
@@ -1830,7 +1831,7 @@ public IndexSettingsDescriptor() : base()
 
 		private Union<string?, int?>? FormatValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? GcDeletesValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? GcDeletesValue { get; set; }
 
 		private Union<bool?, string?>? HiddenValue { get; set; }
 
@@ -1918,7 +1919,7 @@ public IndexSettingsDescriptor() : base()
 
 		private Action<SettingsQueryStringDescriptor> QueryStringDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? RefreshIntervalValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? RefreshIntervalValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.IndexManagement.IndexRouting? RoutingValue { get; set; }
 
@@ -2142,13 +2143,13 @@ public IndexSettingsDescriptor Codec(string? codec)
 			return Self;
 		}
 
-		public IndexSettingsDescriptor CreationDate(string? creationDate)
+		public IndexSettingsDescriptor CreationDate(long? creationDate)
 		{
 			CreationDateValue = creationDate;
 			return Self;
 		}
 
-		public IndexSettingsDescriptor CreationDateString(string? creationDateString)
+		public IndexSettingsDescriptor CreationDateString(DateTimeOffset? creationDateString)
 		{
 			CreationDateStringValue = creationDateString;
 			return Self;
@@ -2172,7 +2173,7 @@ public IndexSettingsDescriptor Format(Union<string?, int?>? format)
 			return Self;
 		}
 
-		public IndexSettingsDescriptor GcDeletes(Elastic.Clients.Elasticsearch.Time? gcDeletes)
+		public IndexSettingsDescriptor GcDeletes(Elastic.Clients.Elasticsearch.Duration? gcDeletes)
 		{
 			GcDeletesValue = gcDeletes;
 			return Self;
@@ -2484,7 +2485,7 @@ public IndexSettingsDescriptor QueryString(Action<SettingsQueryStringDescriptor>
 			return Self;
 		}
 
-		public IndexSettingsDescriptor RefreshInterval(Elastic.Clients.Elasticsearch.Time? refreshInterval)
+		public IndexSettingsDescriptor RefreshInterval(Elastic.Clients.Elasticsearch.Duration? refreshInterval)
 		{
 			RefreshIntervalValue = refreshInterval;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsLifecycleStep.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsLifecycleStep.g.cs
index e0741a735b3..6e11776a2b0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsLifecycleStep.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsLifecycleStep.g.cs
@@ -28,7 +28,7 @@ public partial class IndexSettingsLifecycleStep
 	{
 		[JsonInclude]
 		[JsonPropertyName("wait_time_threshold")]
-		public Elastic.Clients.Elasticsearch.Time? WaitTimeThreshold { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? WaitTimeThreshold { get; set; }
 	}
 
 	public sealed partial class IndexSettingsLifecycleStepDescriptor : SerializableDescriptorBase<IndexSettingsLifecycleStepDescriptor>
@@ -38,9 +38,9 @@ public IndexSettingsLifecycleStepDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? WaitTimeThresholdValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? WaitTimeThresholdValue { get; set; }
 
-		public IndexSettingsLifecycleStepDescriptor WaitTimeThreshold(Elastic.Clients.Elasticsearch.Time? waitTimeThreshold)
+		public IndexSettingsLifecycleStepDescriptor WaitTimeThreshold(Elastic.Clients.Elasticsearch.Duration? waitTimeThreshold)
 		{
 			WaitTimeThresholdValue = waitTimeThreshold;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsTimeSeries.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsTimeSeries.g.cs
index 5fb84140309..8dcc97f3d01 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsTimeSeries.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsTimeSeries.g.cs
@@ -28,11 +28,11 @@ public partial class IndexSettingsTimeSeries
 	{
 		[JsonInclude]
 		[JsonPropertyName("end_time")]
-		public Elastic.Clients.Elasticsearch.DateOrEpochMillis? EndTime { get; set; }
+		public DateTimeOffset? EndTime { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("start_time")]
-		public Elastic.Clients.Elasticsearch.DateOrEpochMillis? StartTime { get; set; }
+		public DateTimeOffset? StartTime { get; set; }
 	}
 
 	public sealed partial class IndexSettingsTimeSeriesDescriptor : SerializableDescriptorBase<IndexSettingsTimeSeriesDescriptor>
@@ -42,17 +42,17 @@ public IndexSettingsTimeSeriesDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.DateOrEpochMillis? EndTimeValue { get; set; }
+		private DateTimeOffset? EndTimeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.DateOrEpochMillis? StartTimeValue { get; set; }
+		private DateTimeOffset? StartTimeValue { get; set; }
 
-		public IndexSettingsTimeSeriesDescriptor EndTime(Elastic.Clients.Elasticsearch.DateOrEpochMillis? endTime)
+		public IndexSettingsTimeSeriesDescriptor EndTime(DateTimeOffset? endTime)
 		{
 			EndTimeValue = endTime;
 			return Self;
 		}
 
-		public IndexSettingsTimeSeriesDescriptor StartTime(Elastic.Clients.Elasticsearch.DateOrEpochMillis? startTime)
+		public IndexSettingsTimeSeriesDescriptor StartTime(DateTimeOffset? startTime)
 		{
 			StartTimeValue = startTime;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RetentionLease.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RetentionLease.g.cs
index 87b62336f59..f76509662d1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RetentionLease.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RetentionLease.g.cs
@@ -28,7 +28,7 @@ public partial class RetentionLease
 	{
 		[JsonInclude]
 		[JsonPropertyName("period")]
-		public Elastic.Clients.Elasticsearch.Time Period { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration Period { get; set; }
 	}
 
 	public sealed partial class RetentionLeaseDescriptor : SerializableDescriptorBase<RetentionLeaseDescriptor>
@@ -38,9 +38,9 @@ public RetentionLeaseDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time PeriodValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration PeriodValue { get; set; }
 
-		public RetentionLeaseDescriptor Period(Elastic.Clients.Elasticsearch.Time period)
+		public RetentionLeaseDescriptor Period(Elastic.Clients.Elasticsearch.Duration period)
 		{
 			PeriodValue = period;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RolloverConditions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RolloverConditions.g.cs
index fa1467facdb..3a44a2acd79 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RolloverConditions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RolloverConditions.g.cs
@@ -28,11 +28,11 @@ public partial class RolloverConditions
 	{
 		[JsonInclude]
 		[JsonPropertyName("max_age")]
-		public Elastic.Clients.Elasticsearch.Time? MaxAge { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? MaxAge { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("max_age_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? MaxAgeMillis { get; set; }
+		public long? MaxAgeMillis { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("max_docs")]
@@ -62,9 +62,9 @@ public RolloverConditionsDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? MaxAgeValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? MaxAgeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.EpochMillis? MaxAgeMillisValue { get; set; }
+		private long? MaxAgeMillisValue { get; set; }
 
 		private long? MaxDocsValue { get; set; }
 
@@ -76,13 +76,13 @@ public RolloverConditionsDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.ByteSize? MaxSizeBytesValue { get; set; }
 
-		public RolloverConditionsDescriptor MaxAge(Elastic.Clients.Elasticsearch.Time? maxAge)
+		public RolloverConditionsDescriptor MaxAge(Elastic.Clients.Elasticsearch.Duration? maxAge)
 		{
 			MaxAgeValue = maxAge;
 			return Self;
 		}
 
-		public RolloverConditionsDescriptor MaxAgeMillis(Elastic.Clients.Elasticsearch.EpochMillis? maxAgeMillis)
+		public RolloverConditionsDescriptor MaxAgeMillis(long? maxAgeMillis)
 		{
 			MaxAgeMillisValue = maxAgeMillis;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SearchIdle.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SearchIdle.g.cs
index 1e5632bf105..1b8c239fb75 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SearchIdle.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SearchIdle.g.cs
@@ -28,7 +28,7 @@ public partial class SearchIdle
 	{
 		[JsonInclude]
 		[JsonPropertyName("after")]
-		public Elastic.Clients.Elasticsearch.Time? After { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? After { get; set; }
 	}
 
 	public sealed partial class SearchIdleDescriptor : SerializableDescriptorBase<SearchIdleDescriptor>
@@ -38,9 +38,9 @@ public SearchIdleDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? AfterValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? AfterValue { get; set; }
 
-		public SearchIdleDescriptor After(Elastic.Clients.Elasticsearch.Time? after)
+		public SearchIdleDescriptor After(Elastic.Clients.Elasticsearch.Duration? after)
 		{
 			AfterValue = after;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStats.g.cs
index 9d496e0815a..f115bc3e1c9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStats.g.cs
@@ -106,10 +106,6 @@ public partial class ShardStats
 		[JsonPropertyName("shard_path")]
 		public Elastic.Clients.Elasticsearch.IndexManagement.ShardPath? ShardPath { get; init; }
 
-		[JsonInclude]
-		[JsonPropertyName("shard_stats")]
-		public Elastic.Clients.Elasticsearch.IndexManagement.ShardsTotalStats? ShardStatsTemp { get; init; }
-
 		[JsonInclude]
 		[JsonPropertyName("shards")]
 		public Elastic.Clients.Elasticsearch.IndexManagement.ShardsTotalStats? Shards { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogTresholdLevels.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogTresholdLevels.g.cs
index b5c050edfd7..128332af7c1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogTresholdLevels.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogTresholdLevels.g.cs
@@ -28,19 +28,19 @@ public partial class SlowlogTresholdLevels
 	{
 		[JsonInclude]
 		[JsonPropertyName("debug")]
-		public Elastic.Clients.Elasticsearch.Time? Debug { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Debug { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("info")]
-		public Elastic.Clients.Elasticsearch.Time? Info { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Info { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("trace")]
-		public Elastic.Clients.Elasticsearch.Time? Trace { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Trace { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("warn")]
-		public Elastic.Clients.Elasticsearch.Time? Warn { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Warn { get; set; }
 	}
 
 	public sealed partial class SlowlogTresholdLevelsDescriptor : SerializableDescriptorBase<SlowlogTresholdLevelsDescriptor>
@@ -50,33 +50,33 @@ public SlowlogTresholdLevelsDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? DebugValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? DebugValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? InfoValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? InfoValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? TraceValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? TraceValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? WarnValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? WarnValue { get; set; }
 
-		public SlowlogTresholdLevelsDescriptor Debug(Elastic.Clients.Elasticsearch.Time? debug)
+		public SlowlogTresholdLevelsDescriptor Debug(Elastic.Clients.Elasticsearch.Duration? debug)
 		{
 			DebugValue = debug;
 			return Self;
 		}
 
-		public SlowlogTresholdLevelsDescriptor Info(Elastic.Clients.Elasticsearch.Time? info)
+		public SlowlogTresholdLevelsDescriptor Info(Elastic.Clients.Elasticsearch.Duration? info)
 		{
 			InfoValue = info;
 			return Self;
 		}
 
-		public SlowlogTresholdLevelsDescriptor Trace(Elastic.Clients.Elasticsearch.Time? trace)
+		public SlowlogTresholdLevelsDescriptor Trace(Elastic.Clients.Elasticsearch.Duration? trace)
 		{
 			TraceValue = trace;
 			return Self;
 		}
 
-		public SlowlogTresholdLevelsDescriptor Warn(Elastic.Clients.Elasticsearch.Time? warn)
+		public SlowlogTresholdLevelsDescriptor Warn(Elastic.Clients.Elasticsearch.Duration? warn)
 		{
 			WarnValue = warn;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Translog.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Translog.g.cs
index bf1d53e5b5c..4badf32348a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Translog.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Translog.g.cs
@@ -40,7 +40,7 @@ public partial class Translog
 
 		[JsonInclude]
 		[JsonPropertyName("sync_interval")]
-		public Elastic.Clients.Elasticsearch.Time? SyncInterval { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? SyncInterval { get; set; }
 	}
 
 	public sealed partial class TranslogDescriptor : SerializableDescriptorBase<TranslogDescriptor>
@@ -60,7 +60,7 @@ public TranslogDescriptor() : base()
 
 		private Action<TranslogRetentionDescriptor> RetentionDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? SyncIntervalValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? SyncIntervalValue { get; set; }
 
 		public TranslogDescriptor Durability(Elastic.Clients.Elasticsearch.IndexManagement.TranslogDurability? durability)
 		{
@@ -98,7 +98,7 @@ public TranslogDescriptor Retention(Action<TranslogRetentionDescriptor> configur
 			return Self;
 		}
 
-		public TranslogDescriptor SyncInterval(Elastic.Clients.Elasticsearch.Time? syncInterval)
+		public TranslogDescriptor SyncInterval(Elastic.Clients.Elasticsearch.Duration? syncInterval)
 		{
 			SyncIntervalValue = syncInterval;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TranslogRetention.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TranslogRetention.g.cs
index a2fce7d4949..1f078e7f191 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TranslogRetention.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TranslogRetention.g.cs
@@ -28,7 +28,7 @@ public partial class TranslogRetention
 	{
 		[JsonInclude]
 		[JsonPropertyName("age")]
-		public Elastic.Clients.Elasticsearch.Time? Age { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Age { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("size")]
@@ -42,11 +42,11 @@ public TranslogRetentionDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? AgeValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? AgeValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.ByteSize? SizeValue { get; set; }
 
-		public TranslogRetentionDescriptor Age(Elastic.Clients.Elasticsearch.Time? age)
+		public TranslogRetentionDescriptor Age(Elastic.Clients.Elasticsearch.Duration? age)
 		{
 			AgeValue = age;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexingStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexingStats.g.cs
index 02ccfd2b17b..aa6dac78ece 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexingStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexingStats.g.cs
@@ -32,7 +32,7 @@ public partial class IndexingStats
 
 		[JsonInclude]
 		[JsonPropertyName("delete_time")]
-		public string? DeleteTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? DeleteTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("delete_time_in_millis")]
@@ -52,7 +52,7 @@ public partial class IndexingStats
 
 		[JsonInclude]
 		[JsonPropertyName("index_time")]
-		public string? IndexTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? IndexTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("index_time_in_millis")]
@@ -72,7 +72,7 @@ public partial class IndexingStats
 
 		[JsonInclude]
 		[JsonPropertyName("throttle_time")]
-		public string? ThrottleTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? ThrottleTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("throttle_time_in_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpDownloadStatistics.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpDownloadStatistics.g.cs
index 9844c2b7bb2..e4965466ed3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpDownloadStatistics.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpDownloadStatistics.g.cs
@@ -44,6 +44,6 @@ public partial class GeoIpDownloadStatistics
 
 		[JsonInclude]
 		[JsonPropertyName("total_download_time")]
-		public int TotalDownloadTime { get; init; }
+		public long TotalDownloadTime { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Ingest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Ingest.g.cs
index 24e440cbe3e..6bf3440a3c1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Ingest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Ingest.g.cs
@@ -32,6 +32,6 @@ public partial class Ingest
 
 		[JsonInclude]
 		[JsonPropertyName("timestamp")]
-		public string Timestamp { get; init; }
+		public DateTimeOffset Timestamp { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/License/License.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/License/License.g.cs
index 49c3043fb12..5076ebc5ab0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/License/License.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/License/License.g.cs
@@ -28,11 +28,11 @@ public partial class License
 	{
 		[JsonInclude]
 		[JsonPropertyName("expiry_date_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis ExpiryDateInMillis { get; set; }
+		public long ExpiryDateInMillis { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("issue_date_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis IssueDateInMillis { get; set; }
+		public long IssueDateInMillis { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("issued_to")]
@@ -56,7 +56,7 @@ public partial class License
 
 		[JsonInclude]
 		[JsonPropertyName("start_date_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? StartDateInMillis { get; set; }
+		public long? StartDateInMillis { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("type")]
@@ -74,9 +74,9 @@ public LicenseDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.EpochMillis ExpiryDateInMillisValue { get; set; }
+		private long ExpiryDateInMillisValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.EpochMillis IssueDateInMillisValue { get; set; }
+		private long IssueDateInMillisValue { get; set; }
 
 		private string IssuedToValue { get; set; }
 
@@ -88,19 +88,19 @@ public LicenseDescriptor() : base()
 
 		private string SignatureValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.EpochMillis? StartDateInMillisValue { get; set; }
+		private long? StartDateInMillisValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.License.LicenseType TypeValue { get; set; }
 
 		private string UidValue { get; set; }
 
-		public LicenseDescriptor ExpiryDateInMillis(Elastic.Clients.Elasticsearch.EpochMillis expiryDateInMillis)
+		public LicenseDescriptor ExpiryDateInMillis(long expiryDateInMillis)
 		{
 			ExpiryDateInMillisValue = expiryDateInMillis;
 			return Self;
 		}
 
-		public LicenseDescriptor IssueDateInMillis(Elastic.Clients.Elasticsearch.EpochMillis issueDateInMillis)
+		public LicenseDescriptor IssueDateInMillis(long issueDateInMillis)
 		{
 			IssueDateInMillisValue = issueDateInMillis;
 			return Self;
@@ -136,7 +136,7 @@ public LicenseDescriptor Signature(string signature)
 			return Self;
 		}
 
-		public LicenseDescriptor StartDateInMillis(Elastic.Clients.Elasticsearch.EpochMillis? startDateInMillis)
+		public LicenseDescriptor StartDateInMillis(long? startDateInMillis)
 		{
 			StartDateInMillisValue = startDateInMillis;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/License/LicenseInformation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/License/LicenseInformation.g.cs
index 132b0ec882c..d7d401e1246 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/License/LicenseInformation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/License/LicenseInformation.g.cs
@@ -28,19 +28,19 @@ public partial class LicenseInformation
 	{
 		[JsonInclude]
 		[JsonPropertyName("expiry_date")]
-		public string? ExpiryDate { get; init; }
+		public DateTimeOffset? ExpiryDate { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("expiry_date_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? ExpiryDateInMillis { get; init; }
+		public long? ExpiryDateInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("issue_date")]
-		public string IssueDate { get; init; }
+		public DateTimeOffset IssueDate { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("issue_date_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis IssueDateInMillis { get; init; }
+		public long IssueDateInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("issued_to")]
@@ -60,7 +60,7 @@ public partial class LicenseInformation
 
 		[JsonInclude]
 		[JsonPropertyName("start_date_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis StartDateInMillis { get; init; }
+		public long StartDateInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("status")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateNanosProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateNanosProperty.g.cs
index 60407eaf23b..00e12c46e82 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateNanosProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateNanosProperty.g.cs
@@ -44,7 +44,7 @@ public partial class DateNanosProperty : DocValuesPropertyBase, IProperty
 
 		[JsonInclude]
 		[JsonPropertyName("null_value")]
-		public string? NullValue { get; set; }
+		public DateTimeOffset? NullValue { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("precision_step")]
@@ -84,7 +84,7 @@ public DateNanosPropertyDescriptor() : base()
 
 		private Dictionary<string, string>? MetaValue { get; set; }
 
-		private string? NullValueValue { get; set; }
+		private DateTimeOffset? NullValueValue { get; set; }
 
 		private int? PrecisionStepValue { get; set; }
 
@@ -180,7 +180,7 @@ public DateNanosPropertyDescriptor<TDocument> Meta(Func<FluentDictionary<string,
 			return Self;
 		}
 
-		public DateNanosPropertyDescriptor<TDocument> NullValue(string? nullValue)
+		public DateNanosPropertyDescriptor<TDocument> NullValue(DateTimeOffset? nullValue)
 		{
 			NullValueValue = nullValue;
 			return Self;
@@ -361,7 +361,7 @@ public DateNanosPropertyDescriptor() : base()
 
 		private Dictionary<string, string>? MetaValue { get; set; }
 
-		private string? NullValueValue { get; set; }
+		private DateTimeOffset? NullValueValue { get; set; }
 
 		private int? PrecisionStepValue { get; set; }
 
@@ -463,7 +463,7 @@ public DateNanosPropertyDescriptor Meta(Func<FluentDictionary<string, string>, F
 			return Self;
 		}
 
-		public DateNanosPropertyDescriptor NullValue(string? nullValue)
+		public DateNanosPropertyDescriptor NullValue(DateTimeOffset? nullValue)
 		{
 			NullValueValue = nullValue;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateProperty.g.cs
index f31a437869f..018e4ce12b4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateProperty.g.cs
@@ -52,7 +52,7 @@ public partial class DateProperty : DocValuesPropertyBase, IProperty
 
 		[JsonInclude]
 		[JsonPropertyName("null_value")]
-		public string? NullValue { get; set; }
+		public DateTimeOffset? NullValue { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("precision_step")]
@@ -100,7 +100,7 @@ public DatePropertyDescriptor() : base()
 
 		private Dictionary<string, string>? MetaValue { get; set; }
 
-		private string? NullValueValue { get; set; }
+		private DateTimeOffset? NullValueValue { get; set; }
 
 		private int? PrecisionStepValue { get; set; }
 
@@ -226,7 +226,7 @@ public DatePropertyDescriptor<TDocument> Meta(Func<FluentDictionary<string, stri
 			return Self;
 		}
 
-		public DatePropertyDescriptor<TDocument> NullValue(string? nullValue)
+		public DatePropertyDescriptor<TDocument> NullValue(DateTimeOffset? nullValue)
 		{
 			NullValueValue = nullValue;
 			return Self;
@@ -461,7 +461,7 @@ public DatePropertyDescriptor() : base()
 
 		private Dictionary<string, string>? MetaValue { get; set; }
 
-		private string? NullValueValue { get; set; }
+		private DateTimeOffset? NullValueValue { get; set; }
 
 		private int? PrecisionStepValue { get; set; }
 
@@ -593,7 +593,7 @@ public DatePropertyDescriptor Meta(Func<FluentDictionary<string, string>, Fluent
 			return Self;
 		}
 
-		public DatePropertyDescriptor NullValue(string? nullValue)
+		public DatePropertyDescriptor NullValue(DateTimeOffset? nullValue)
 		{
 			NullValueValue = nullValue;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MergesStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MergesStats.g.cs
index 1d1be16efc1..c56a0b8367f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MergesStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MergesStats.g.cs
@@ -68,7 +68,7 @@ public partial class MergesStats
 
 		[JsonInclude]
 		[JsonPropertyName("total_stopped_time")]
-		public string? TotalStoppedTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? TotalStoppedTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_stopped_time_in_millis")]
@@ -76,7 +76,7 @@ public partial class MergesStats
 
 		[JsonInclude]
 		[JsonPropertyName("total_throttled_time")]
-		public string? TotalThrottledTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? TotalThrottledTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_throttled_time_in_millis")]
@@ -84,7 +84,7 @@ public partial class MergesStats
 
 		[JsonInclude]
 		[JsonPropertyName("total_time")]
-		public string? TotalTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? TotalTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_time_in_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Migration/MigrationFeature.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Migration/MigrationFeature.g.cs
index 72faf353cdd..79a7ea670eb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Migration/MigrationFeature.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Migration/MigrationFeature.g.cs
@@ -29,5 +29,17 @@ public partial class MigrationFeature
 		[JsonInclude]
 		[JsonPropertyName("feature_name")]
 		public string FeatureName { get; init; }
+
+		[JsonInclude]
+		[JsonPropertyName("indices")]
+		public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Migration.MigrationFeatureIndexInfo> Indices { get; init; }
+
+		[JsonInclude]
+		[JsonPropertyName("migration_status")]
+		public Elastic.Clients.Elasticsearch.Migration.MigrationStatus MigrationStatus { get; init; }
+
+		[JsonInclude]
+		[JsonPropertyName("minimum_index_version")]
+		public string MinimumIndexVersion { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/AnalysisConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/AnalysisConfig.g.cs
index 6c15f645ce2..11079801ac9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/AnalysisConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/AnalysisConfig.g.cs
@@ -28,7 +28,7 @@ public partial class AnalysisConfig
 	{
 		[JsonInclude]
 		[JsonPropertyName("bucket_span")]
-		public string BucketSpan { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration BucketSpan { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("categorization_analyzer")]
@@ -52,11 +52,11 @@ public partial class AnalysisConfig
 
 		[JsonInclude]
 		[JsonPropertyName("latency")]
-		public Elastic.Clients.Elasticsearch.Time? Latency { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Latency { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("model_prune_window")]
-		public Elastic.Clients.Elasticsearch.Time? ModelPruneWindow { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? ModelPruneWindow { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("multivariate_by_fields")]
@@ -86,7 +86,7 @@ public AnalysisConfigDescriptor() : base()
 
 		private Action<DetectorDescriptor<TDocument>>[] DetectorsDescriptorActions { get; set; }
 
-		private string BucketSpanValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration BucketSpanValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.Ml.CategorizationAnalyzer? CategorizationAnalyzerValue { get; set; }
 
@@ -96,9 +96,9 @@ public AnalysisConfigDescriptor() : base()
 
 		private IEnumerable<Elastic.Clients.Elasticsearch.Field>? InfluencersValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? LatencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? LatencyValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? ModelPruneWindowValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? ModelPruneWindowValue { get; set; }
 
 		private bool? MultivariateByFieldsValue { get; set; }
 
@@ -146,7 +146,7 @@ public AnalysisConfigDescriptor<TDocument> Detectors(params Action<DetectorDescr
 			return Self;
 		}
 
-		public AnalysisConfigDescriptor<TDocument> BucketSpan(string bucketSpan)
+		public AnalysisConfigDescriptor<TDocument> BucketSpan(Elastic.Clients.Elasticsearch.Duration bucketSpan)
 		{
 			BucketSpanValue = bucketSpan;
 			return Self;
@@ -182,13 +182,13 @@ public AnalysisConfigDescriptor<TDocument> Influencers(IEnumerable<Elastic.Clien
 			return Self;
 		}
 
-		public AnalysisConfigDescriptor<TDocument> Latency(Elastic.Clients.Elasticsearch.Time? latency)
+		public AnalysisConfigDescriptor<TDocument> Latency(Elastic.Clients.Elasticsearch.Duration? latency)
 		{
 			LatencyValue = latency;
 			return Self;
 		}
 
-		public AnalysisConfigDescriptor<TDocument> ModelPruneWindow(Elastic.Clients.Elasticsearch.Time? modelPruneWindow)
+		public AnalysisConfigDescriptor<TDocument> ModelPruneWindow(Elastic.Clients.Elasticsearch.Duration? modelPruneWindow)
 		{
 			ModelPruneWindowValue = modelPruneWindow;
 			return Self;
@@ -351,7 +351,7 @@ public AnalysisConfigDescriptor() : base()
 
 		private Action<DetectorDescriptor>[] DetectorsDescriptorActions { get; set; }
 
-		private string BucketSpanValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration BucketSpanValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.Ml.CategorizationAnalyzer? CategorizationAnalyzerValue { get; set; }
 
@@ -361,9 +361,9 @@ public AnalysisConfigDescriptor() : base()
 
 		private IEnumerable<Elastic.Clients.Elasticsearch.Field>? InfluencersValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? LatencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? LatencyValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? ModelPruneWindowValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? ModelPruneWindowValue { get; set; }
 
 		private bool? MultivariateByFieldsValue { get; set; }
 
@@ -411,7 +411,7 @@ public AnalysisConfigDescriptor Detectors(params Action<DetectorDescriptor>[] co
 			return Self;
 		}
 
-		public AnalysisConfigDescriptor BucketSpan(string bucketSpan)
+		public AnalysisConfigDescriptor BucketSpan(Elastic.Clients.Elasticsearch.Duration bucketSpan)
 		{
 			BucketSpanValue = bucketSpan;
 			return Self;
@@ -453,13 +453,13 @@ public AnalysisConfigDescriptor Influencers(IEnumerable<Elastic.Clients.Elastics
 			return Self;
 		}
 
-		public AnalysisConfigDescriptor Latency(Elastic.Clients.Elasticsearch.Time? latency)
+		public AnalysisConfigDescriptor Latency(Elastic.Clients.Elasticsearch.Duration? latency)
 		{
 			LatencyValue = latency;
 			return Self;
 		}
 
-		public AnalysisConfigDescriptor ModelPruneWindow(Elastic.Clients.Elasticsearch.Time? modelPruneWindow)
+		public AnalysisConfigDescriptor ModelPruneWindow(Elastic.Clients.Elasticsearch.Duration? modelPruneWindow)
 		{
 			ModelPruneWindowValue = modelPruneWindow;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/AnalysisConfigRead.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/AnalysisConfigRead.g.cs
index 663f5306496..44c71bbee36 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/AnalysisConfigRead.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/AnalysisConfigRead.g.cs
@@ -28,7 +28,7 @@ public partial class AnalysisConfigRead
 	{
 		[JsonInclude]
 		[JsonPropertyName("bucket_span")]
-		public string BucketSpan { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration BucketSpan { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("categorization_analyzer")]
@@ -52,11 +52,11 @@ public partial class AnalysisConfigRead
 
 		[JsonInclude]
 		[JsonPropertyName("latency")]
-		public Elastic.Clients.Elasticsearch.Time? Latency { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? Latency { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("model_prune_window")]
-		public Elastic.Clients.Elasticsearch.Time? ModelPruneWindow { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? ModelPruneWindow { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("multivariate_by_fields")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Anomaly.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Anomaly.g.cs
index 039e74aded7..14f1d50649d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Anomaly.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Anomaly.g.cs
@@ -32,7 +32,7 @@ public partial class Anomaly
 
 		[JsonInclude]
 		[JsonPropertyName("bucket_span")]
-		public Elastic.Clients.Elasticsearch.Time BucketSpan { get; init; }
+		public long BucketSpan { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("by_field_name")]
@@ -108,7 +108,7 @@ public partial class Anomaly
 
 		[JsonInclude]
 		[JsonPropertyName("timestamp")]
-		public Elastic.Clients.Elasticsearch.EpochMillis Timestamp { get; init; }
+		public long Timestamp { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("typical")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/CalendarEvent.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/CalendarEvent.g.cs
index 00d84d5e297..e8bc9b6d455 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/CalendarEvent.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/CalendarEvent.g.cs
@@ -36,7 +36,7 @@ public partial class CalendarEvent
 
 		[JsonInclude]
 		[JsonPropertyName("end_time")]
-		public Elastic.Clients.Elasticsearch.EpochMillis EndTime { get; set; }
+		public DateTimeOffset EndTime { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("event_id")]
@@ -44,7 +44,7 @@ public partial class CalendarEvent
 
 		[JsonInclude]
 		[JsonPropertyName("start_time")]
-		public Elastic.Clients.Elasticsearch.EpochMillis StartTime { get; set; }
+		public DateTimeOffset StartTime { get; set; }
 	}
 
 	public sealed partial class CalendarEventDescriptor : SerializableDescriptorBase<CalendarEventDescriptor>
@@ -58,11 +58,11 @@ public CalendarEventDescriptor() : base()
 
 		private string DescriptionValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.EpochMillis EndTimeValue { get; set; }
+		private DateTimeOffset EndTimeValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.Id? EventIdValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.EpochMillis StartTimeValue { get; set; }
+		private DateTimeOffset StartTimeValue { get; set; }
 
 		public CalendarEventDescriptor CalendarId(Elastic.Clients.Elasticsearch.Id? calendarId)
 		{
@@ -76,7 +76,7 @@ public CalendarEventDescriptor Description(string description)
 			return Self;
 		}
 
-		public CalendarEventDescriptor EndTime(Elastic.Clients.Elasticsearch.EpochMillis endTime)
+		public CalendarEventDescriptor EndTime(DateTimeOffset endTime)
 		{
 			EndTimeValue = endTime;
 			return Self;
@@ -88,7 +88,7 @@ public CalendarEventDescriptor EventId(Elastic.Clients.Elasticsearch.Id? eventId
 			return Self;
 		}
 
-		public CalendarEventDescriptor StartTime(Elastic.Clients.Elasticsearch.EpochMillis startTime)
+		public CalendarEventDescriptor StartTime(DateTimeOffset startTime)
 		{
 			StartTimeValue = startTime;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ChunkingConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ChunkingConfig.g.cs
index c4866d9ed58..946bd4b5ec3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ChunkingConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ChunkingConfig.g.cs
@@ -32,7 +32,7 @@ public partial class ChunkingConfig
 
 		[JsonInclude]
 		[JsonPropertyName("time_span")]
-		public Elastic.Clients.Elasticsearch.Time? TimeSpan { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? TimeSpan { get; set; }
 	}
 
 	public sealed partial class ChunkingConfigDescriptor : SerializableDescriptorBase<ChunkingConfigDescriptor>
@@ -44,7 +44,7 @@ public ChunkingConfigDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.Ml.ChunkingMode ModeValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? TimeSpanValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? TimeSpanValue { get; set; }
 
 		public ChunkingConfigDescriptor Mode(Elastic.Clients.Elasticsearch.Ml.ChunkingMode mode)
 		{
@@ -52,7 +52,7 @@ public ChunkingConfigDescriptor Mode(Elastic.Clients.Elasticsearch.Ml.ChunkingMo
 			return Self;
 		}
 
-		public ChunkingConfigDescriptor TimeSpan(Elastic.Clients.Elasticsearch.Time? timeSpan)
+		public ChunkingConfigDescriptor TimeSpan(Elastic.Clients.Elasticsearch.Duration? timeSpan)
 		{
 			TimeSpanValue = timeSpan;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Datafeed.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Datafeed.g.cs
index 0e40b97e73b..e53e5d3225c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Datafeed.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Datafeed.g.cs
@@ -44,7 +44,7 @@ public partial class Datafeed
 
 		[JsonInclude]
 		[JsonPropertyName("frequency")]
-		public string? Frequency { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? Frequency { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("indexes")]
@@ -72,7 +72,7 @@ public partial class Datafeed
 
 		[JsonInclude]
 		[JsonPropertyName("query_delay")]
-		public string? QueryDelay { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? QueryDelay { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("runtime_mappings")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DatafeedConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DatafeedConfig.g.cs
index d90b6510052..095eda34210 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DatafeedConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DatafeedConfig.g.cs
@@ -44,7 +44,7 @@ public partial class DatafeedConfig
 
 		[JsonInclude]
 		[JsonPropertyName("frequency")]
-		public string? Frequency { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Frequency { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("indexes")]
@@ -72,7 +72,7 @@ public partial class DatafeedConfig
 
 		[JsonInclude]
 		[JsonPropertyName("query_delay")]
-		public string? QueryDelay { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? QueryDelay { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("runtime_mappings")]
@@ -116,7 +116,7 @@ public DatafeedConfigDescriptor() : base()
 
 		private Action<DelayedDataCheckConfigDescriptor> DelayedDataCheckConfigDescriptorAction { get; set; }
 
-		private string? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private IEnumerable<string>? IndexesValue { get; set; }
 
@@ -132,7 +132,7 @@ public DatafeedConfigDescriptor() : base()
 
 		private int? MaxEmptySearchesValue { get; set; }
 
-		private string? QueryDelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? QueryDelayValue { get; set; }
 
 		private Dictionary<Elastic.Clients.Elasticsearch.Field, IEnumerable<Elastic.Clients.Elasticsearch.Mapping.RuntimeField>>? RuntimeMappingsValue { get; set; }
 
@@ -224,7 +224,7 @@ public DatafeedConfigDescriptor<TDocument> DelayedDataCheckConfig(Action<Delayed
 			return Self;
 		}
 
-		public DatafeedConfigDescriptor<TDocument> Frequency(string? frequency)
+		public DatafeedConfigDescriptor<TDocument> Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
@@ -278,7 +278,7 @@ public DatafeedConfigDescriptor<TDocument> MaxEmptySearches(int? maxEmptySearche
 			return Self;
 		}
 
-		public DatafeedConfigDescriptor<TDocument> QueryDelay(string? queryDelay)
+		public DatafeedConfigDescriptor<TDocument> QueryDelay(Elastic.Clients.Elasticsearch.Duration? queryDelay)
 		{
 			QueryDelayValue = queryDelay;
 			return Self;
@@ -464,7 +464,7 @@ public DatafeedConfigDescriptor() : base()
 
 		private Action<DelayedDataCheckConfigDescriptor> DelayedDataCheckConfigDescriptorAction { get; set; }
 
-		private string? FrequencyValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? FrequencyValue { get; set; }
 
 		private IEnumerable<string>? IndexesValue { get; set; }
 
@@ -480,7 +480,7 @@ public DatafeedConfigDescriptor() : base()
 
 		private int? MaxEmptySearchesValue { get; set; }
 
-		private string? QueryDelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? QueryDelayValue { get; set; }
 
 		private Dictionary<Elastic.Clients.Elasticsearch.Field, IEnumerable<Elastic.Clients.Elasticsearch.Mapping.RuntimeField>>? RuntimeMappingsValue { get; set; }
 
@@ -572,7 +572,7 @@ public DatafeedConfigDescriptor DelayedDataCheckConfig(Action<DelayedDataCheckCo
 			return Self;
 		}
 
-		public DatafeedConfigDescriptor Frequency(string? frequency)
+		public DatafeedConfigDescriptor Frequency(Elastic.Clients.Elasticsearch.Duration? frequency)
 		{
 			FrequencyValue = frequency;
 			return Self;
@@ -626,7 +626,7 @@ public DatafeedConfigDescriptor MaxEmptySearches(int? maxEmptySearches)
 			return Self;
 		}
 
-		public DatafeedConfigDescriptor QueryDelay(string? queryDelay)
+		public DatafeedConfigDescriptor QueryDelay(Elastic.Clients.Elasticsearch.Duration? queryDelay)
 		{
 			QueryDelayValue = queryDelay;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DataframeAnalyticsStatsMemoryUsage.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DataframeAnalyticsStatsMemoryUsage.g.cs
index 15e87c3da76..89aad9e4002 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DataframeAnalyticsStatsMemoryUsage.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DataframeAnalyticsStatsMemoryUsage.g.cs
@@ -40,6 +40,6 @@ public partial class DataframeAnalyticsStatsMemoryUsage
 
 		[JsonInclude]
 		[JsonPropertyName("timestamp")]
-		public string? Timestamp { get; init; }
+		public long? Timestamp { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DelayedDataCheckConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DelayedDataCheckConfig.g.cs
index ad25f7f130d..c589f77ffd8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DelayedDataCheckConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/DelayedDataCheckConfig.g.cs
@@ -28,7 +28,7 @@ public partial class DelayedDataCheckConfig
 	{
 		[JsonInclude]
 		[JsonPropertyName("check_window")]
-		public Elastic.Clients.Elasticsearch.Time? CheckWindow { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? CheckWindow { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("enabled")]
@@ -42,11 +42,11 @@ public DelayedDataCheckConfigDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? CheckWindowValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? CheckWindowValue { get; set; }
 
 		private bool EnabledValue { get; set; }
 
-		public DelayedDataCheckConfigDescriptor CheckWindow(Elastic.Clients.Elasticsearch.Time? checkWindow)
+		public DelayedDataCheckConfigDescriptor CheckWindow(Elastic.Clients.Elasticsearch.Duration? checkWindow)
 		{
 			CheckWindowValue = checkWindow;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Influencer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Influencer.g.cs
index 304336ca97e..76539e46ae7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Influencer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Influencer.g.cs
@@ -68,6 +68,6 @@ public partial class Influencer
 
 		[JsonInclude]
 		[JsonPropertyName("timestamp")]
-		public Elastic.Clients.Elasticsearch.Time Timestamp { get; init; }
+		public long Timestamp { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/JobConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/JobConfig.g.cs
index 0838c376d61..37c570cac35 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/JobConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/JobConfig.g.cs
@@ -40,7 +40,7 @@ public partial class JobConfig
 
 		[JsonInclude]
 		[JsonPropertyName("background_persist_interval")]
-		public Elastic.Clients.Elasticsearch.Time? BackgroundPersistInterval { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? BackgroundPersistInterval { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("custom_settings")]
@@ -134,7 +134,7 @@ public JobConfigDescriptor() : base()
 
 		private Action<AnalysisLimitsDescriptor> AnalysisLimitsDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? BackgroundPersistIntervalValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? BackgroundPersistIntervalValue { get; set; }
 
 		private object? CustomSettingsValue { get; set; }
 
@@ -282,7 +282,7 @@ public JobConfigDescriptor<TDocument> AnalysisLimits(Action<AnalysisLimitsDescri
 			return Self;
 		}
 
-		public JobConfigDescriptor<TDocument> BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Time? backgroundPersistInterval)
+		public JobConfigDescriptor<TDocument> BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Duration? backgroundPersistInterval)
 		{
 			BackgroundPersistIntervalValue = backgroundPersistInterval;
 			return Self;
@@ -546,7 +546,7 @@ public JobConfigDescriptor() : base()
 
 		private Action<AnalysisLimitsDescriptor> AnalysisLimitsDescriptorAction { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? BackgroundPersistIntervalValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? BackgroundPersistIntervalValue { get; set; }
 
 		private object? CustomSettingsValue { get; set; }
 
@@ -694,7 +694,7 @@ public JobConfigDescriptor AnalysisLimits(Action<AnalysisLimitsDescriptor> confi
 			return Self;
 		}
 
-		public JobConfigDescriptor BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Time? backgroundPersistInterval)
+		public JobConfigDescriptor BackgroundPersistInterval(Elastic.Clients.Elasticsearch.Duration? backgroundPersistInterval)
 		{
 			BackgroundPersistIntervalValue = backgroundPersistInterval;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/JobStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/JobStats.g.cs
index 1b8ed1b95d7..71fc243c8a5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/JobStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/JobStats.g.cs
@@ -56,7 +56,7 @@ public partial class JobStats
 
 		[JsonInclude]
 		[JsonPropertyName("open_time")]
-		public string? OpenTime { get; init; }
+		public DateTimeOffset? OpenTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("state")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ModelSizeStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ModelSizeStats.g.cs
index 16f222e8917..89010c929d8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ModelSizeStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ModelSizeStats.g.cs
@@ -60,7 +60,7 @@ public partial class ModelSizeStats
 
 		[JsonInclude]
 		[JsonPropertyName("log_time")]
-		public Elastic.Clients.Elasticsearch.Time LogTime { get; init; }
+		public DateTimeOffset LogTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("memory_status")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/OverallBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/OverallBucket.g.cs
index 7c98ca3bf80..77f4f2298a8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/OverallBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/OverallBucket.g.cs
@@ -48,6 +48,10 @@ public partial class OverallBucket
 
 		[JsonInclude]
 		[JsonPropertyName("timestamp")]
-		public Elastic.Clients.Elasticsearch.Time Timestamp { get; init; }
+		public long Timestamp { get; init; }
+
+		[JsonInclude]
+		[JsonPropertyName("timestamp_string")]
+		public DateTimeOffset TimestampString { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TrainedModelInferenceStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TrainedModelInferenceStats.g.cs
index 89cdb9bba9a..2ba4e7206e2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TrainedModelInferenceStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TrainedModelInferenceStats.g.cs
@@ -44,6 +44,6 @@ public partial class TrainedModelInferenceStats
 
 		[JsonInclude]
 		[JsonPropertyName("timestamp")]
-		public Elastic.Clients.Elasticsearch.Time Timestamp { get; init; }
+		public DateTimeOffset Timestamp { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Weights.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Weights.g.cs
index 6855ad869ad..4f7ffafc6d0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Weights.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/Weights.g.cs
@@ -26,9 +26,6 @@ namespace Elastic.Clients.Elasticsearch.Ml
 {
 	public partial class Weights
 	{
-		[JsonInclude]
-		[JsonPropertyName("weights")]
-		public double WeightsTemp { get; set; }
 	}
 
 	public sealed partial class WeightsDescriptor : SerializableDescriptorBase<WeightsDescriptor>
@@ -38,20 +35,8 @@ public WeightsDescriptor() : base()
 		{
 		}
 
-		private double WeightsTempValue { get; set; }
-
-		public WeightsDescriptor WeightsTemp(double weightsTemp)
-		{
-			WeightsTempValue = weightsTemp;
-			return Self;
-		}
-
 		protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 		{
-			writer.WriteStartObject();
-			writer.WritePropertyName("weights");
-			writer.WriteNumberValue(WeightsTempValue);
-			writer.WriteEndObject();
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/ClusterStateUpdate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/ClusterStateUpdate.g.cs
index 5ea0cb5a540..2d5f1a78ba1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/ClusterStateUpdate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/ClusterStateUpdate.g.cs
@@ -28,7 +28,7 @@ public partial class ClusterStateUpdate
 	{
 		[JsonInclude]
 		[JsonPropertyName("commit_time")]
-		public string? CommitTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? CommitTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("commit_time_millis")]
@@ -36,7 +36,7 @@ public partial class ClusterStateUpdate
 
 		[JsonInclude]
 		[JsonPropertyName("completion_time")]
-		public string? CompletionTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? CompletionTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("completion_time_millis")]
@@ -44,7 +44,7 @@ public partial class ClusterStateUpdate
 
 		[JsonInclude]
 		[JsonPropertyName("computation_time")]
-		public string? ComputationTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? ComputationTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("computation_time_millis")]
@@ -52,7 +52,7 @@ public partial class ClusterStateUpdate
 
 		[JsonInclude]
 		[JsonPropertyName("context_construction_time")]
-		public string? ContextConstructionTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? ContextConstructionTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("context_construction_time_millis")]
@@ -60,11 +60,11 @@ public partial class ClusterStateUpdate
 
 		[JsonInclude]
 		[JsonPropertyName("count")]
-		public long? Count { get; init; }
+		public long Count { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("master_apply_time")]
-		public string? MasterApplyTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? MasterApplyTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("master_apply_time_millis")]
@@ -72,7 +72,7 @@ public partial class ClusterStateUpdate
 
 		[JsonInclude]
 		[JsonPropertyName("notification_time")]
-		public string? NotificationTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? NotificationTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("notification_time_millis")]
@@ -80,7 +80,7 @@ public partial class ClusterStateUpdate
 
 		[JsonInclude]
 		[JsonPropertyName("publication_time")]
-		public string? PublicationTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? PublicationTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("publication_time_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Context.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Context.g.cs
index cfb89b9a3cd..d0c4c3532a2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Context.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Context.g.cs
@@ -37,9 +37,5 @@ public partial class Context
 		[JsonInclude]
 		[JsonPropertyName("compilations")]
 		public long? Compilations { get; init; }
-
-		[JsonInclude]
-		[JsonPropertyName("context")]
-		public string? ContextTemp { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Cpu.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Cpu.g.cs
index 8581a92a60c..cf934a689fc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Cpu.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Cpu.g.cs
@@ -36,7 +36,7 @@ public partial class Cpu
 
 		[JsonInclude]
 		[JsonPropertyName("sys")]
-		public string? Sys { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? Sys { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("sys_in_millis")]
@@ -44,7 +44,7 @@ public partial class Cpu
 
 		[JsonInclude]
 		[JsonPropertyName("total")]
-		public string? Total { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? Total { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_in_millis")]
@@ -52,7 +52,7 @@ public partial class Cpu
 
 		[JsonInclude]
 		[JsonPropertyName("user")]
-		public string? User { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? User { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("user_in_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeOperatingSystemInfo.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeOperatingSystemInfo.g.cs
index 4058e747189..d37f4afd718 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeOperatingSystemInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeOperatingSystemInfo.g.cs
@@ -56,7 +56,7 @@ public partial class NodeOperatingSystemInfo
 
 		[JsonInclude]
 		[JsonPropertyName("refresh_interval_in_millis")]
-		public int RefreshIntervalInMillis { get; init; }
+		public long RefreshIntervalInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("swap")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeThreadPoolInfo.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeThreadPoolInfo.g.cs
index 6f907e10ffc..93d0d27a2e5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeThreadPoolInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeThreadPoolInfo.g.cs
@@ -32,7 +32,7 @@ public partial class NodeThreadPoolInfo
 
 		[JsonInclude]
 		[JsonPropertyName("keep_alive")]
-		public string? KeepAlive { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("max")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeUsage.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeUsage.g.cs
index 6223e249d81..3874511b046 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeUsage.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/NodeUsage.g.cs
@@ -36,10 +36,10 @@ public partial class NodeUsage
 
 		[JsonInclude]
 		[JsonPropertyName("since")]
-		public Elastic.Clients.Elasticsearch.EpochMillis Since { get; init; }
+		public long Since { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("timestamp")]
-		public Elastic.Clients.Elasticsearch.EpochMillis Timestamp { get; init; }
+		public long Timestamp { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Recording.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Recording.g.cs
index 2a466297769..62d233bfee1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Recording.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Nodes/Recording.g.cs
@@ -32,7 +32,7 @@ public partial class Recording
 
 		[JsonInclude]
 		[JsonPropertyName("cumulative_execution_time")]
-		public string? CumulativeExecutionTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? CumulativeExecutionTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("cumulative_execution_time_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/PointInTimeReference.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/PointInTimeReference.g.cs
index 6132457cbb4..76ec7a88fe2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/PointInTimeReference.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/PointInTimeReference.g.cs
@@ -32,7 +32,7 @@ public partial class PointInTimeReference
 
 		[JsonInclude]
 		[JsonPropertyName("keep_alive")]
-		public Elastic.Clients.Elasticsearch.Time? KeepAlive { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get; set; }
 	}
 
 	public sealed partial class PointInTimeReferenceDescriptor : SerializableDescriptorBase<PointInTimeReferenceDescriptor>
@@ -44,7 +44,7 @@ public PointInTimeReferenceDescriptor() : base()
 
 		private string IdValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? KeepAliveValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? KeepAliveValue { get; set; }
 
 		public PointInTimeReferenceDescriptor Id(string id)
 		{
@@ -52,7 +52,7 @@ public PointInTimeReferenceDescriptor Id(string id)
 			return Self;
 		}
 
-		public PointInTimeReferenceDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Time? keepAlive)
+		public PointInTimeReferenceDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive)
 		{
 			KeepAliveValue = keepAlive;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RecoveryStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RecoveryStats.g.cs
index 79660cc10f2..148117f2ec5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RecoveryStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RecoveryStats.g.cs
@@ -36,7 +36,7 @@ public partial class RecoveryStats
 
 		[JsonInclude]
 		[JsonPropertyName("throttle_time")]
-		public string? ThrottleTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? ThrottleTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("throttle_time_in_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RefreshStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RefreshStats.g.cs
index a2006551c99..6d4133bbad1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RefreshStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RefreshStats.g.cs
@@ -44,7 +44,7 @@ public partial class RefreshStats
 
 		[JsonInclude]
 		[JsonPropertyName("total_time")]
-		public string? TotalTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? TotalTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_time_in_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ReindexStatus.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ReindexStatus.g.cs
index a7c65b395c8..3392ca341f2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ReindexStatus.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ReindexStatus.g.cs
@@ -50,10 +50,18 @@ public partial class ReindexStatus
 		[JsonPropertyName("retries")]
 		public Elastic.Clients.Elasticsearch.Retries Retries { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("throttled")]
+		public Elastic.Clients.Elasticsearch.Duration? Throttled { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("throttled_millis")]
 		public long ThrottledMillis { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("throttled_until")]
+		public Elastic.Clients.Elasticsearch.Duration? ThrottledUntil { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("throttled_until_millis")]
 		public long ThrottledUntilMillis { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RemoteSource.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RemoteSource.g.cs
index e97c72f7a04..26fccfe41b6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RemoteSource.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RemoteSource.g.cs
@@ -28,7 +28,7 @@ public partial class RemoteSource
 	{
 		[JsonInclude]
 		[JsonPropertyName("connect_timeout")]
-		public Elastic.Clients.Elasticsearch.Time? ConnectTimeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? ConnectTimeout { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("headers")]
@@ -44,7 +44,7 @@ public partial class RemoteSource
 
 		[JsonInclude]
 		[JsonPropertyName("socket_timeout")]
-		public Elastic.Clients.Elasticsearch.Time? SocketTimeout { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? SocketTimeout { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("username")]
@@ -58,7 +58,7 @@ public RemoteSourceDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? ConnectTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? ConnectTimeoutValue { get; set; }
 
 		private Dictionary<string, string>? HeadersValue { get; set; }
 
@@ -66,11 +66,11 @@ public RemoteSourceDescriptor() : base()
 
 		private string? PasswordValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time? SocketTimeoutValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? SocketTimeoutValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.Username? UsernameValue { get; set; }
 
-		public RemoteSourceDescriptor ConnectTimeout(Elastic.Clients.Elasticsearch.Time? connectTimeout)
+		public RemoteSourceDescriptor ConnectTimeout(Elastic.Clients.Elasticsearch.Duration? connectTimeout)
 		{
 			ConnectTimeoutValue = connectTimeout;
 			return Self;
@@ -94,7 +94,7 @@ public RemoteSourceDescriptor Password(string? password)
 			return Self;
 		}
 
-		public RemoteSourceDescriptor SocketTimeout(Elastic.Clients.Elasticsearch.Time? socketTimeout)
+		public RemoteSourceDescriptor SocketTimeout(Elastic.Clients.Elasticsearch.Duration? socketTimeout)
 		{
 			SocketTimeoutValue = socketTimeout;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchStats.g.cs
index 01efeeecb83..c3485afeef8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchStats.g.cs
@@ -30,6 +30,10 @@ public partial class SearchStats
 		[JsonPropertyName("fetch_current")]
 		public long FetchCurrent { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("fetch_time")]
+		public Elastic.Clients.Elasticsearch.Duration? FetchTime { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("fetch_time_in_millis")]
 		public long FetchTimeInMillis { get; init; }
@@ -50,6 +54,10 @@ public partial class SearchStats
 		[JsonPropertyName("query_current")]
 		public long QueryCurrent { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("query_time")]
+		public Elastic.Clients.Elasticsearch.Duration? QueryTime { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("query_time_in_millis")]
 		public long QueryTimeInMillis { get; init; }
@@ -62,6 +70,10 @@ public partial class SearchStats
 		[JsonPropertyName("scroll_current")]
 		public long ScrollCurrent { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("scroll_time")]
+		public Elastic.Clients.Elasticsearch.Duration? ScrollTime { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("scroll_time_in_millis")]
 		public long ScrollTimeInMillis { get; init; }
@@ -74,6 +86,10 @@ public partial class SearchStats
 		[JsonPropertyName("suggest_current")]
 		public long SuggestCurrent { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("suggest_time")]
+		public Elastic.Clients.Elasticsearch.Duration? SuggestTime { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("suggest_time_in_millis")]
 		public long SuggestTimeInMillis { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/GrantApiKey.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/GrantApiKey.g.cs
index 8eb4280c6dc..b84464b80b6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/GrantApiKey.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/GrantApiKey.g.cs
@@ -28,7 +28,7 @@ public partial class GrantApiKey
 	{
 		[JsonInclude]
 		[JsonPropertyName("expiration")]
-		public Elastic.Clients.Elasticsearch.Time? Expiration { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Expiration { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("name")]
@@ -46,13 +46,13 @@ public GrantApiKeyDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? ExpirationValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? ExpirationValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.Name NameValue { get; set; }
 
 		private IEnumerable<Dictionary<string, object>>? RoleDescriptorsValue { get; set; }
 
-		public GrantApiKeyDescriptor Expiration(Elastic.Clients.Elasticsearch.Time? expiration)
+		public GrantApiKeyDescriptor Expiration(Elastic.Clients.Elasticsearch.Duration? expiration)
 		{
 			ExpirationValue = expiration;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slm/Retention.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slm/Retention.g.cs
index a396367801d..a9ed95b8eab 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slm/Retention.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slm/Retention.g.cs
@@ -28,7 +28,7 @@ public partial class Retention
 	{
 		[JsonInclude]
 		[JsonPropertyName("expire_after")]
-		public Elastic.Clients.Elasticsearch.Time ExpireAfter { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration ExpireAfter { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("max_count")]
@@ -46,13 +46,13 @@ public RetentionDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time ExpireAfterValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration ExpireAfterValue { get; set; }
 
 		private int MaxCountValue { get; set; }
 
 		private int MinCountValue { get; set; }
 
-		public RetentionDescriptor ExpireAfter(Elastic.Clients.Elasticsearch.Time expireAfter)
+		public RetentionDescriptor ExpireAfter(Elastic.Clients.Elasticsearch.Duration expireAfter)
 		{
 			ExpireAfterValue = expireAfter;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slm/Statistics.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slm/Statistics.g.cs
index 85f274f3ec3..31537abbca3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slm/Statistics.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slm/Statistics.g.cs
@@ -32,11 +32,11 @@ public partial class Statistics
 
 		[JsonInclude]
 		[JsonPropertyName("retention_deletion_time")]
-		public string? RetentionDeletionTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? RetentionDeletionTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("retention_deletion_time_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? RetentionDeletionTimeMillis { get; init; }
+		public long? RetentionDeletionTimeMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("retention_failed")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/ShardsStatsSummary.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/ShardsStatsSummary.g.cs
index fda233923af..5d4426a08c1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/ShardsStatsSummary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/ShardsStatsSummary.g.cs
@@ -34,6 +34,10 @@ public partial class ShardsStatsSummary
 		[JsonPropertyName("start_time_in_millis")]
 		public long StartTimeInMillis { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("time")]
+		public Elastic.Clients.Elasticsearch.Duration? Time { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("time_in_millis")]
 		public long TimeInMillis { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotInfo.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotInfo.g.cs
index 9217f66fb8a..62a6677f283 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotInfo.g.cs
@@ -32,19 +32,19 @@ public partial class SnapshotInfo
 
 		[JsonInclude]
 		[JsonPropertyName("duration")]
-		public Elastic.Clients.Elasticsearch.Time? Duration { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? Duration { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("duration_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? DurationInMillis { get; init; }
+		public long? DurationInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("end_time")]
-		public Elastic.Clients.Elasticsearch.Time? EndTime { get; init; }
+		public DateTimeOffset? EndTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("end_time_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? EndTimeInMillis { get; init; }
+		public long? EndTimeInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("failures")]
@@ -88,11 +88,11 @@ public partial class SnapshotInfo
 
 		[JsonInclude]
 		[JsonPropertyName("start_time")]
-		public Elastic.Clients.Elasticsearch.Time? StartTime { get; init; }
+		public DateTimeOffset? StartTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("start_time_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? StartTimeInMillis { get; init; }
+		public long? StartTimeInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("state")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotStats.g.cs
index 8cac68ac72e..b0e6c60fbb7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Snapshot/SnapshotStats.g.cs
@@ -34,6 +34,10 @@ public partial class SnapshotStats
 		[JsonPropertyName("start_time_in_millis")]
 		public long StartTimeInMillis { get; init; }
 
+		[JsonInclude]
+		[JsonPropertyName("time")]
+		public Elastic.Clients.Elasticsearch.Duration? Time { get; init; }
+
 		[JsonInclude]
 		[JsonPropertyName("time_in_millis")]
 		public long TimeInMillis { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskInfo.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskInfo.g.cs
index 5df083eb29e..1c18a3259ce 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskInfo.g.cs
@@ -56,7 +56,7 @@ public partial class TaskInfo
 
 		[JsonInclude]
 		[JsonPropertyName("running_time")]
-		public string? RunningTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? RunningTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("running_time_in_nanos")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskStatus.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskStatus.g.cs
index 94aac45ef70..47cca55c39f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskStatus.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskStatus.g.cs
@@ -60,7 +60,7 @@ public partial class TaskStatus
 
 		[JsonInclude]
 		[JsonPropertyName("throttled")]
-		public Elastic.Clients.Elasticsearch.Time? Throttled { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? Throttled { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("throttled_millis")]
@@ -68,7 +68,7 @@ public partial class TaskStatus
 
 		[JsonInclude]
 		[JsonPropertyName("throttled_until")]
-		public Elastic.Clients.Elasticsearch.Time? ThrottledUntil { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? ThrottledUntil { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("throttled_until_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/CheckpointStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/CheckpointStats.g.cs
index 9b232189e3e..9dd91c7083c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/CheckpointStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/CheckpointStats.g.cs
@@ -36,18 +36,18 @@ public partial class CheckpointStats
 
 		[JsonInclude]
 		[JsonPropertyName("time_upper_bound")]
-		public string? TimeUpperBound { get; init; }
+		public DateTimeOffset? TimeUpperBound { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("time_upper_bound_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? TimeUpperBoundMillis { get; init; }
+		public long? TimeUpperBoundMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("timestamp")]
-		public string? Timestamp { get; init; }
+		public DateTimeOffset? Timestamp { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("timestamp_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? TimestampMillis { get; init; }
+		public long? TimestampMillis { get; init; }
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Checkpointing.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Checkpointing.g.cs
index a12a1539dd0..01f1e6bbecc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Checkpointing.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/Checkpointing.g.cs
@@ -32,7 +32,7 @@ public partial class Checkpointing
 
 		[JsonInclude]
 		[JsonPropertyName("changes_last_detected_at_date_time")]
-		public string? ChangesLastDetectedAtDateTime { get; init; }
+		public DateTimeOffset? ChangesLastDetectedAtDateTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("last")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/RetentionPolicy.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/RetentionPolicy.g.cs
index e686547c5af..c38bf13a2cb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/RetentionPolicy.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/RetentionPolicy.g.cs
@@ -32,7 +32,7 @@ public partial class RetentionPolicy : IRetentionPolicyVariant
 
 		[JsonInclude]
 		[JsonPropertyName("max_age")]
-		public Elastic.Clients.Elasticsearch.Time MaxAge { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration MaxAge { get; set; }
 	}
 
 	public sealed partial class RetentionPolicyDescriptor<TDocument> : SerializableDescriptorBase<RetentionPolicyDescriptor<TDocument>>
@@ -44,7 +44,7 @@ public RetentionPolicyDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time MaxAgeValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration MaxAgeValue { get; set; }
 
 		public RetentionPolicyDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field field)
 		{
@@ -58,7 +58,7 @@ public RetentionPolicyDescriptor<TDocument> Field<TValue>(Expression<Func<TDocum
 			return Self;
 		}
 
-		public RetentionPolicyDescriptor<TDocument> MaxAge(Elastic.Clients.Elasticsearch.Time maxAge)
+		public RetentionPolicyDescriptor<TDocument> MaxAge(Elastic.Clients.Elasticsearch.Duration maxAge)
 		{
 			MaxAgeValue = maxAge;
 			return Self;
@@ -84,7 +84,7 @@ public RetentionPolicyDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
 
-		private Elastic.Clients.Elasticsearch.Time MaxAgeValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration MaxAgeValue { get; set; }
 
 		public RetentionPolicyDescriptor Field(Elastic.Clients.Elasticsearch.Field field)
 		{
@@ -104,7 +104,7 @@ public RetentionPolicyDescriptor Field<TDocument>(Expression<Func<TDocument, obj
 			return Self;
 		}
 
-		public RetentionPolicyDescriptor MaxAge(Elastic.Clients.Elasticsearch.Time maxAge)
+		public RetentionPolicyDescriptor MaxAge(Elastic.Clients.Elasticsearch.Duration maxAge)
 		{
 			MaxAgeValue = maxAge;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TimeSync.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TimeSync.g.cs
index 9ecf25c9f80..4bec1087d2f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TimeSync.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TimeSync.g.cs
@@ -28,7 +28,7 @@ public partial class TimeSync : ISyncVariant
 	{
 		[JsonInclude]
 		[JsonPropertyName("delay")]
-		public Elastic.Clients.Elasticsearch.Time? Delay { get; set; }
+		public Elastic.Clients.Elasticsearch.Duration? Delay { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("field")]
@@ -42,11 +42,11 @@ public TimeSyncDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? DelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? DelayValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
 
-		public TimeSyncDescriptor<TDocument> Delay(Elastic.Clients.Elasticsearch.Time? delay)
+		public TimeSyncDescriptor<TDocument> Delay(Elastic.Clients.Elasticsearch.Duration? delay)
 		{
 			DelayValue = delay;
 			return Self;
@@ -86,11 +86,11 @@ public TimeSyncDescriptor() : base()
 		{
 		}
 
-		private Elastic.Clients.Elasticsearch.Time? DelayValue { get; set; }
+		private Elastic.Clients.Elasticsearch.Duration? DelayValue { get; set; }
 
 		private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
 
-		public TimeSyncDescriptor Delay(Elastic.Clients.Elasticsearch.Time? delay)
+		public TimeSyncDescriptor Delay(Elastic.Clients.Elasticsearch.Duration? delay)
 		{
 			DelayValue = delay;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TransformIndexerStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TransformIndexerStats.g.cs
index 646b41e4f47..2cb2f057181 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TransformIndexerStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TransformIndexerStats.g.cs
@@ -28,7 +28,7 @@ public partial class TransformIndexerStats
 	{
 		[JsonInclude]
 		[JsonPropertyName("delete_time_in_ms")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? DeleteTimeInMs { get; init; }
+		public long? DeleteTimeInMs { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("documents_deleted")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TransformSummary.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TransformSummary.g.cs
index ad54ef2fb0b..74813b3e16b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TransformSummary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/TransformSummary.g.cs
@@ -32,7 +32,7 @@ public partial class TransformSummary
 
 		[JsonInclude]
 		[JsonPropertyName("create_time")]
-		public Elastic.Clients.Elasticsearch.EpochMillis? CreateTime { get; init; }
+		public long? CreateTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("description")]
@@ -44,7 +44,7 @@ public partial class TransformSummary
 
 		[JsonInclude]
 		[JsonPropertyName("frequency")]
-		public Elastic.Clients.Elasticsearch.Time? Frequency { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? Frequency { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("id")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/WarmerStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/WarmerStats.g.cs
index f2c2dbcc8ee..05feb44b0cc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/WarmerStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/WarmerStats.g.cs
@@ -36,7 +36,7 @@ public partial class WarmerStats
 
 		[JsonInclude]
 		[JsonPropertyName("total_time")]
-		public string? TotalTime { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration? TotalTime { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_time_in_millis")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/BuildInformation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/BuildInformation.g.cs
index b9faf5379aa..3ad6f4525b1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/BuildInformation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/BuildInformation.g.cs
@@ -28,7 +28,7 @@ public partial class BuildInformation
 	{
 		[JsonInclude]
 		[JsonPropertyName("date")]
-		public string Date { get; init; }
+		public DateTimeOffset Date { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("hash")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/DataStreams.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/DataStreams.g.cs
index cc45a2083dd..5ab15d33efc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/DataStreams.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/DataStreams.g.cs
@@ -26,10 +26,6 @@ namespace Elastic.Clients.Elasticsearch.Xpack
 {
 	public partial class DataStreams : Base
 	{
-		[JsonInclude]
-		[JsonPropertyName("data_streams")]
-		public long DataStreamsTemp { get; init; }
-
 		[JsonInclude]
 		[JsonPropertyName("indices_count")]
 		public long IndicesCount { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/MinimalLicenseInformation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/MinimalLicenseInformation.g.cs
index 9330229a9f1..2c0a36e6e85 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/MinimalLicenseInformation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/MinimalLicenseInformation.g.cs
@@ -28,7 +28,7 @@ public partial class MinimalLicenseInformation
 	{
 		[JsonInclude]
 		[JsonPropertyName("expiry_date_in_millis")]
-		public Elastic.Clients.Elasticsearch.EpochMillis ExpiryDateInMillis { get; init; }
+		public long ExpiryDateInMillis { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("mode")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/WatcherActionTotals.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/WatcherActionTotals.g.cs
index 71f0b4dc5b7..c3842ae4bd4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/WatcherActionTotals.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Xpack/WatcherActionTotals.g.cs
@@ -28,7 +28,7 @@ public partial class WatcherActionTotals
 	{
 		[JsonInclude]
 		[JsonPropertyName("total")]
-		public long Total { get; init; }
+		public Elastic.Clients.Elasticsearch.Duration Total { get; init; }
 
 		[JsonInclude]
 		[JsonPropertyName("total_time_in_ms")]
diff --git a/tests/Tests/Aggregations/Bucket/DateHistogramAggregationUsageTests.cs b/tests/Tests/Aggregations/Bucket/DateHistogramAggregationUsageTests.cs
index c00ed1cdf09..4a9b0ea7a62 100644
--- a/tests/Tests/Aggregations/Bucket/DateHistogramAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Bucket/DateHistogramAggregationUsageTests.cs
@@ -33,7 +33,7 @@ public DateHistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage
 				//	min = FixedDate.AddYears(-1),
 				//	max = FixedDate.AddYears(1)
 				//},
-				missing = "2015-06-06T12:01:02.1230000"
+				missing = "2015-06-06T12:01:02.123+00:00"
 			},
 			aggregations = new
 			{
@@ -63,7 +63,7 @@ public DateHistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage
 			.Format("yyyy-MM-dd'T'HH:mm:ss||date_optional_time")
 			//.ExtendedBounds(FixedDate.AddYears(-1), FixedDate.AddYears(1))
 			.Order(new HistogramOrder { Count = SortOrder.Asc })
-			.Missing("2015-06-06T12:01:02.1230000")
+			.Missing(DateTimeOffset.Parse("2015-06-06T12:01:02.1230000", styles: System.Globalization.DateTimeStyles.AssumeUniversal))
 			.Aggregations(childAggs => childAggs
 				.Nested("project_tags", n => n
 					.Path(p => p.Tags)
@@ -86,8 +86,8 @@ public DateHistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage
 			//	Minimum = FixedDate.AddYears(-1),
 			//	Maximum = FixedDate.AddYears(1),
 			//},
-			Order = new HistogramOrder { Count = SortOrder.Asc }, // TODO: Not compatible with existiing NEST
-			Missing = "2015-06-06T12:01:02.1230000", // TODO: Implement Missing accepting a date!
+			Order = new HistogramOrder { Count = SortOrder.Asc },
+			Missing = DateTimeOffset.Parse("2015-06-06T12:01:02.1230000", styles: System.Globalization.DateTimeStyles.AssumeUniversal),
 			Aggregations = new NestedAggregation("project_tags")
 			{
 				Path = Field<Project>(p => p.Tags),
diff --git a/tests/Tests/AsyncSearch/AsyncSearchApiTests.cs b/tests/Tests/AsyncSearch/AsyncSearchApiTests.cs
index 4807bde2d54..293f7ad196b 100644
--- a/tests/Tests/AsyncSearch/AsyncSearchApiTests.cs
+++ b/tests/Tests/AsyncSearch/AsyncSearchApiTests.cs
@@ -32,7 +32,7 @@ public AsyncSearchApiTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(
 					{
 						Query = new MatchAllQuery(),
 						KeepOnCompletion = true,
-						WaitForCompletionTimeout = Time.MinusOne,
+						WaitForCompletionTimeout = Duration.MinusOne,
 						Aggregations = new TermsAggregation("states")
 						{
 							Field = Infer.Field<Project>(p => p.State.Suffix("keyword")),
@@ -128,8 +128,9 @@ public async Task AsyncSearchSubmitResponse() => await Assert<AsyncSearchSubmitR
 		public async Task AsyncSearchStatusResponse() => await Assert<AsyncSearchStatusResponse>(StatusStep, r =>
 		{
 			r.ShouldBeValid();
-			r.StartTime.Should().BeOnOrBefore(DateTimeOffset.Now);
-			r.ExpirationTime.Should().BeOnOrAfter(DateTimeOffset.Now);
+			r.StartTimeInMillis.Should().BeGreaterThan(DateTimeOffset.UtcNow.AddMinutes(-10).ToUnixTimeMilliseconds());
+			r.StartTimeInMillis.Should().BeLessOrEqualTo(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
+			r.ExpirationTimeInMillis.Should().BeGreaterOrEqualTo(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
 
 			if (r.IsRunning)
 				r.CompletionStatus.HasValue.Should().BeFalse();
@@ -144,8 +145,9 @@ public async Task AsyncSearchGetResponse() => await Assert<GetAsyncSearchRespons
 		{
 			r.ShouldBeValid();
 			r.Id.Should().NotBeNullOrEmpty();
-			r.StartTime.Should().BeOnOrBefore(DateTimeOffset.Now);
-			r.ExpirationTime.Should().BeOnOrAfter(DateTimeOffset.Now);
+			r.StartTimeInMillis.Should().BeGreaterThan(DateTimeOffset.UtcNow.AddMinutes(-10).ToUnixTimeMilliseconds());
+			r.StartTimeInMillis.Should().BeLessOrEqualTo(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
+			r.ExpirationTimeInMillis.Should().BeGreaterOrEqualTo(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
 			r.Response.Should().NotBeNull();
 			r.Response.Took.Should().BeGreaterOrEqualTo(0);
 			r.Response.Hits.Should().HaveCount(10);
diff --git a/tests/Tests/Cluster/ClusterHealth/ClusterHealthResponseDeserialisationTests.cs b/tests/Tests/Cluster/ClusterHealth/ClusterHealthResponseDeserialisationTests.cs
index 95b851862ed..658e0d67f7a 100644
--- a/tests/Tests/Cluster/ClusterHealth/ClusterHealthResponseDeserialisationTests.cs
+++ b/tests/Tests/Cluster/ClusterHealth/ClusterHealthResponseDeserialisationTests.cs
@@ -91,7 +91,7 @@ protected override void Validate(ClusterHealthResponse response)
 			issueIndex.Status.Should().Be(HealthStatus.Green);
 			issueIndex.NumberOfShards.Should().Be(10);
 
-			response.TaskMaxWaitingInQueueMillis.MillisecondsSinceEpoch.Should().Be(56);
+			response.TaskMaxWaitingInQueueMillis.Should().Be(56);
 			response.ActiveShardsPercentAsNumber.Should().Be(100.0);
 		}
 	}
diff --git a/tests/Tests/Cluster/ClusterHealth/ClusterHealthShardsApiTests.cs b/tests/Tests/Cluster/ClusterHealth/ClusterHealthShardsApiTests.cs
index a279cf2c08b..0197157a050 100644
--- a/tests/Tests/Cluster/ClusterHealth/ClusterHealthShardsApiTests.cs
+++ b/tests/Tests/Cluster/ClusterHealth/ClusterHealthShardsApiTests.cs
@@ -45,7 +45,7 @@ protected override void ExpectResponse(ClusterHealthResponse response)
 		response.ActiveShardsPercentAsNumber.Should().BePositive();
 		response.DelayedUnassignedShards.Should().Be(0);
 		response.NumberOfInFlightFetch.Should().BeGreaterOrEqualTo(0);
-		response.TaskMaxWaitingInQueueMillis.MillisecondsSinceEpoch.Should().BeGreaterOrEqualTo(0);
+		response.TaskMaxWaitingInQueueMillis.Should().BeGreaterOrEqualTo(0);
 
 		response.Indices.HasValue.Should().BeTrue();
 
diff --git a/tests/Tests/Common/TimeUnit/TimeUnits.cs b/tests/Tests/Common/TimeUnit/TimeUnits.cs
index 1d171ee44f2..d98e37061b6 100644
--- a/tests/Tests/Common/TimeUnit/TimeUnits.cs
+++ b/tests/Tests/Common/TimeUnit/TimeUnits.cs
@@ -24,10 +24,10 @@ public class TimeUnits
 		 */
 		[U] public void Constructor()
 		{
-			var unitString = new Time("2d");
-			var unitComposed = new Time(2, Elastic.Clients.Elasticsearch.TimeUnit.Days);
-			var unitTimeSpan = new Time(TimeSpan.FromDays(2));
-			var unitMilliseconds = new Time(1000 * 60 * 60 * 24 * 2);
+			var unitString = new Duration("2d");
+			var unitComposed = new Duration(2, Elastic.Clients.Elasticsearch.TimeUnit.Days);
+			var unitTimeSpan = new Duration(TimeSpan.FromDays(2));
+			var unitMilliseconds = new Duration(1000 * 60 * 60 * 24 * 2);
 
 			/**
 			* When serializing Time constructed from
@@ -59,9 +59,9 @@ [U] public void Constructor()
 		*/
 		[U] public void ImplicitConversion()
 		{
-			Time oneMinute = "1m";
-			Time fourteenDays = TimeSpan.FromDays(14);
-			Time twoDays = 1000*60*60*24*2;
+			Duration oneMinute = "1m";
+			Duration fourteenDays = TimeSpan.FromDays(14);
+			Duration twoDays = 1000*60*60*24*2;
 
 			Expect("1m").WhenSerializing(oneMinute);
 			Expect("14d").WhenSerializing(fourteenDays);
@@ -78,35 +78,35 @@ public void EqualityAndComparable()
 			* Comparisons on the expressions can be performed since Milliseconds are calculated
 			* even when values are not passed as `double` milliseconds
 			*/
-			Time fourteenDays = TimeSpan.FromDays(14);
+			Duration fourteenDays = TimeSpan.FromDays(14);
 			fourteenDays.Milliseconds.Should().Be(1209600000);
 
-			Time twoDays = 1000*60*60*24*2;
+			Duration twoDays = 1000*60*60*24*2;
 
 			fourteenDays.Should().BeGreaterThan(twoDays);
 			(fourteenDays > twoDays).Should().BeTrue();
 			(twoDays != null).Should().BeTrue();
-			(twoDays >= new Time("2d")).Should().BeTrue();
+			(twoDays >= new Duration("2d")).Should().BeTrue();
 
 			twoDays.Should().BeLessThan(fourteenDays);
 			(twoDays < fourteenDays).Should().BeTrue();
 			(twoDays <= fourteenDays).Should().BeTrue();
-			(twoDays <= new Time("2d")).Should().BeTrue();
+			(twoDays <= new Duration("2d")).Should().BeTrue();
 
 			/**
 			* Equality can also be performed
 			*/
-			twoDays.Should().Be(new Time("2d"));
-			(twoDays == new Time("2d")).Should().BeTrue();
-			(twoDays != new Time("2.1d")).Should().BeTrue();
-			(new Time("2.1d") == new Time(TimeSpan.FromDays(2.1))).Should().BeTrue();
+			twoDays.Should().Be(new Duration("2d"));
+			(twoDays == new Duration("2d")).Should().BeTrue();
+			(twoDays != new Duration("2.1d")).Should().BeTrue();
+			(new Duration("2.1d") == new Duration(TimeSpan.FromDays(2.1))).Should().BeTrue();
 
 			/**
 			 * Equality has down to 1/10 nanosecond precision
 			 */
-			Time oneNanosecond = new Time(1, Elastic.Clients.Elasticsearch.TimeUnit.Nanoseconds);
-			Time onePointNoughtNineNanoseconds = "1.09nanos";
-			Time onePointOneNanoseconds = "1.1nanos";
+			Duration oneNanosecond = new Duration(1, Elastic.Clients.Elasticsearch.TimeUnit.Nanoseconds);
+			Duration onePointNoughtNineNanoseconds = "1.09nanos";
+			Duration onePointOneNanoseconds = "1.1nanos";
 
 			(oneNanosecond == onePointNoughtNineNanoseconds).Should().BeTrue();
 			(oneNanosecond == onePointOneNanoseconds).Should().BeFalse();
@@ -124,38 +124,38 @@ [U] public void SpecialTimeValues()
 			/**
 			 * The following are all equal to `Time.MinusOne`
 			 */
-			Time.MinusOne.Should().Be(Time.MinusOne);
-			new Time("-1").Should().Be(Time.MinusOne);
-			new Time(-1).Should().Be(Time.MinusOne);
-			((Time) (-1)).Should().Be(Time.MinusOne);
-			((Time) "-1").Should().Be(Time.MinusOne);
-			((Time) (-1)).Should().Be((Time) "-1");
+			Duration.MinusOne.Should().Be(Duration.MinusOne);
+			new Duration("-1").Should().Be(Duration.MinusOne);
+			new Duration(-1).Should().Be(Duration.MinusOne);
+			((Duration) (-1)).Should().Be(Duration.MinusOne);
+			((Duration) "-1").Should().Be(Duration.MinusOne);
+			((Duration) (-1)).Should().Be((Duration) "-1");
 
 			/**
 			 * Similarly, the following are all equal to `Time.Zero`
 			 */
-			Time.Zero.Should().Be(Time.Zero);
-			new Time("0").Should().Be(Time.Zero);
-			new Time(0).Should().Be(Time.Zero);
-			((Time) 0).Should().Be(Time.Zero);
-			((Time) "0").Should().Be(Time.Zero);
-			((Time) 0).Should().Be((Time) "0");
+			Duration.Zero.Should().Be(Duration.Zero);
+			new Duration("0").Should().Be(Duration.Zero);
+			new Duration(0).Should().Be(Duration.Zero);
+			((Duration) 0).Should().Be(Duration.Zero);
+			((Duration) "0").Should().Be(Duration.Zero);
+			((Duration) 0).Should().Be((Duration) "0");
 
 			/** Special Time values `0` and `-1` can be compared against other Time values
 			 * although admittedly, this is a tad nonsensical.
 			 */
-			var twoDays = new Time(2, Elastic.Clients.Elasticsearch.TimeUnit.Days);
-			Time.MinusOne.Should().BeLessThan(Time.Zero);
-			Time.Zero.Should().BeGreaterThan(Time.MinusOne);
-			Time.Zero.Should().BeLessThan(twoDays);
-			Time.MinusOne.Should().BeLessThan(twoDays);
+			var twoDays = new Duration(2, Elastic.Clients.Elasticsearch.TimeUnit.Days);
+			Duration.MinusOne.Should().BeLessThan(Duration.Zero);
+			Duration.Zero.Should().BeGreaterThan(Duration.MinusOne);
+			Duration.Zero.Should().BeLessThan(twoDays);
+			Duration.MinusOne.Should().BeLessThan(twoDays);
 
 			/**
 			 * If there is a need to construct a time of -1ms or 0ms, use the constructor
 			 * that accepts a factor and time unit, or specify a string with ms time units
 			 */
-			(new Time(-1, Elastic.Clients.Elasticsearch.TimeUnit.Milliseconds) == new Time("-1ms")).Should().BeTrue();
-			(new Time(0, Elastic.Clients.Elasticsearch.TimeUnit.Milliseconds) == new Time("0ms")).Should().BeTrue();
+			(new Duration(-1, Elastic.Clients.Elasticsearch.TimeUnit.Milliseconds) == new Duration("-1ms")).Should().BeTrue();
+			(new Duration(0, Elastic.Clients.Elasticsearch.TimeUnit.Milliseconds) == new Duration("0ms")).Should().BeTrue();
 		}
 
 		// hide
@@ -195,7 +195,7 @@ [U]public void StringImplicitConversionParsing()
 
 			foreach (var testCase in testCases)
 			{
-				var time = new Time(testCase.Item1);
+				var time = new Duration(testCase.Item1);
 				time.ToTimeSpan().Should().Be(testCase.Item2, "we passed in {0}", testCase.Item1);
 				time.ToString().Should().Be(testCase.Item3);
 			}
@@ -211,7 +211,7 @@ [U]public void StringParseExceptions()
 			};
 			foreach (var testCase in testCases)
 			{
-				Action create = () => new Time(testCase.Item1);
+				Action create = () => new Duration(testCase.Item1);
 				var e = create.Invoking((a) => a()).Should().Throw<ArgumentException>(testCase.Item1).Subject.First();
 				e.Message.Should().Contain(testCase.Item3);
 			}
@@ -248,7 +248,7 @@ [U]public void DoubleImplicitConversionParsing()
 			};
 			foreach (var testCase in testCases)
 			{
-				var time = new Time(testCase.Item1);
+				var time = new Duration(testCase.Item1);
 				time.ToTimeSpan().Should().Be(testCase.Item2, "we passed in {0}", testCase.Item1);
 				time.ToString().Should().Be(testCase.Item3);
 			}
@@ -257,7 +257,7 @@ [U]public void DoubleImplicitConversionParsing()
 		// hide
 		[U] public void DoubleImplicitConversionOneNanosecond()
 		{
-			Time oneNanosecond = 1e-6;
+			Duration oneNanosecond = 1e-6;
 			// cannot be expressed as a TimeSpan using ToTimeSpan(), as smaller than a one tick.
 			oneNanosecond.ToTimeSpan().Should().Be(TimeSpan.Zero);
 			oneNanosecond.ToString().Should().Be("1nanos");
@@ -290,55 +290,55 @@ [U] public void DoubleImplicitConversionOneNanosecond()
 		[U] public void MillisecondsNeverSerializeToMonthsOrYears()
 		{
 			double millisecondsInAMonth = 2592000000;
-			Expect("30d").WhenSerializing(new Time(millisecondsInAMonth));
-			Expect("60d").WhenSerializing(new Time(millisecondsInAMonth * 2));
-			Expect("360d").WhenSerializing(new Time(millisecondsInAMonth * 12));
-			Expect("720d").WhenSerializing(new Time(millisecondsInAMonth * 24));
+			Expect("30d").WhenSerializing(new Duration(millisecondsInAMonth));
+			Expect("60d").WhenSerializing(new Duration(millisecondsInAMonth * 2));
+			Expect("360d").WhenSerializing(new Duration(millisecondsInAMonth * 12));
+			Expect("720d").WhenSerializing(new Duration(millisecondsInAMonth * 24));
 		}
 
 		//hide
 		[U] public void ExpectedValues()
 		{
-			Expect(0).WhenSerializing(new Time(0));
-			Expect(0).WhenSerializing((Time)0);
-			Expect(0).WhenSerializing(new Time("0"));
-			Expect(0).WhenSerializing(Time.Zero);
-			Expect(-1).WhenSerializing(new Time(-1));
-			Expect(-1).WhenSerializing((Time)(-1));
-			Expect(-1).WhenSerializing(new Time("-1"));
-			Expect(-1).WhenSerializing(Time.MinusOne);
+			Expect(0).WhenSerializing(new Duration(0));
+			Expect(0).WhenSerializing((Duration)0);
+			Expect(0).WhenSerializing(new Duration("0"));
+			Expect(0).WhenSerializing(Duration.Zero);
+			Expect(-1).WhenSerializing(new Duration(-1));
+			Expect(-1).WhenSerializing((Duration)(-1));
+			Expect(-1).WhenSerializing(new Duration("-1"));
+			Expect(-1).WhenSerializing(Duration.MinusOne);
 
 			Assert(
 				1, Elastic.Clients.Elasticsearch.TimeUnit.Days, TimeSpan.FromDays(1).TotalMilliseconds, "1d",
-				new Time(1, Elastic.Clients.Elasticsearch.TimeUnit.Days),
-				new Time("1d"),
-				new Time(TimeSpan.FromDays(1).TotalMilliseconds)
+				new Duration(1, Elastic.Clients.Elasticsearch.TimeUnit.Days),
+				new Duration("1d"),
+				new Duration(TimeSpan.FromDays(1).TotalMilliseconds)
 			);
 
 			Assert(
 				1, Elastic.Clients.Elasticsearch.TimeUnit.Hours, TimeSpan.FromHours(1).TotalMilliseconds, "1h",
-				new Time(1, Elastic.Clients.Elasticsearch.TimeUnit.Hours),
-				new Time("1h"),
-				new Time(TimeSpan.FromHours(1).TotalMilliseconds)
+				new Duration(1, Elastic.Clients.Elasticsearch.TimeUnit.Hours),
+				new Duration("1h"),
+				new Duration(TimeSpan.FromHours(1).TotalMilliseconds)
 			);
 
 			Assert(
 				1, Elastic.Clients.Elasticsearch.TimeUnit.Minutes, TimeSpan.FromMinutes(1).TotalMilliseconds, "1m",
-				new Time(1, Elastic.Clients.Elasticsearch.TimeUnit.Minutes),
-				new Time("1m"),
-				new Time(TimeSpan.FromMinutes(1).TotalMilliseconds)
+				new Duration(1, Elastic.Clients.Elasticsearch.TimeUnit.Minutes),
+				new Duration("1m"),
+				new Duration(TimeSpan.FromMinutes(1).TotalMilliseconds)
 			);
 
 			Assert(
 				1, Elastic.Clients.Elasticsearch.TimeUnit.Seconds, TimeSpan.FromSeconds(1).TotalMilliseconds, "1s",
-				new Time(1, Elastic.Clients.Elasticsearch.TimeUnit.Seconds),
-				new Time("1s"),
-				new Time(TimeSpan.FromSeconds(1).TotalMilliseconds)
+				new Duration(1, Elastic.Clients.Elasticsearch.TimeUnit.Seconds),
+				new Duration("1s"),
+				new Duration(TimeSpan.FromSeconds(1).TotalMilliseconds)
 			);
 		}
 
 		//hide
-		private void Assert(double expectedFactor, Elastic.Clients.Elasticsearch.TimeUnit expectedInterval, double expectedMilliseconds, string expectedSerialized, params Time[] times)
+		private void Assert(double expectedFactor, Elastic.Clients.Elasticsearch.TimeUnit expectedInterval, double expectedMilliseconds, string expectedSerialized, params Duration[] times)
 		{
 			foreach (var time in times)
 			{
diff --git a/tests/Tests/Eql/EqlSearchApiCoordinatedTests.cs b/tests/Tests/Eql/EqlSearchApiCoordinatedTests.cs
index 2765a255a1a..2bc1b99a1cd 100644
--- a/tests/Tests/Eql/EqlSearchApiCoordinatedTests.cs
+++ b/tests/Tests/Eql/EqlSearchApiCoordinatedTests.cs
@@ -109,12 +109,12 @@ [I] public async Task EqlSearchStatusResponse() => await Assert<EqlGetStatusResp
 
 			if (r.ExpirationTimeInMillis.HasValue)
 			{
-				r.ExpirationTimeInMillis.Value.MillisecondsSinceEpoch.Should().BeGreaterThan(DateTimeOffset.Now.AddHours(-2).ToUnixTimeMilliseconds());
+				r.ExpirationTimeInMillis.Value.Should().BeGreaterThan(DateTimeOffset.Now.AddHours(-2).ToUnixTimeMilliseconds());
 			}
 
 			if (r.StartTimeInMillis.HasValue)
 			{
-				r.StartTimeInMillis.Value.MillisecondsSinceEpoch.Should().BeGreaterThan(DateTimeOffset.Now.AddHours(-2).ToUnixTimeMilliseconds());
+				r.StartTimeInMillis.Value.Should().BeGreaterThan(DateTimeOffset.Now.AddHours(-2).ToUnixTimeMilliseconds());
 			}
 
 			if (!r.IsRunning)
diff --git a/tests/Tests/Serialization/Aggregations/BucketSubAggregationSerializationTests.cs b/tests/Tests/Serialization/Aggregations/BucketSubAggregationSerializationTests.cs
index 08b4c728ade..7cd4da6eb1b 100644
--- a/tests/Tests/Serialization/Aggregations/BucketSubAggregationSerializationTests.cs
+++ b/tests/Tests/Serialization/Aggregations/BucketSubAggregationSerializationTests.cs
@@ -23,7 +23,7 @@ public void DeserializeSubAggsForDateHistorgram()
 
 		var dateBucket = dateHistogramAgg.Buckets.First();
 
-		dateBucket.Key.Should().Be(new EpochMillis(1517443200000));
+		dateBucket.Key.Should().Be(1517443200000);
 		dateBucket.KeyAsString.Should().Be("2018-02-01T00:00:00.000Z");
 
 		var firstSum = dateBucket.GetSum("trade-volumes");
diff --git a/tests/Tests/Serialization/Indices/IndexSettingsSerialisationTests.cs b/tests/Tests/Serialization/Indices/IndexSettingsSerialisationTests.cs
new file mode 100644
index 00000000000..474817e3e7c
--- /dev/null
+++ b/tests/Tests/Serialization/Indices/IndexSettingsSerialisationTests.cs
@@ -0,0 +1,39 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System.Threading.Tasks;
+using Elastic.Clients.Elasticsearch.IndexManagement;
+using VerifyXunit;
+
+namespace Tests.Serialization;
+
+[UsesVerify]
+public class IndexSettingsSerializationTests : SerializerTestBase
+{
+	private const string IndexSettingsJson = @"{""creation_date"":""1655895084631""}";
+
+	[U]
+	public async Task CanSerialize_CreationDate()
+	{
+		var settings = new IndexSettings { CreationDate = 1655895084631 };
+		var json = SerializeAndGetJsonString(settings);
+		await Verifier.VerifyJson(json);
+	}
+
+	[U]
+	public async Task CanSerialize_NullCreationDate()
+	{
+		var settings = new IndexSettings();
+		var json = SerializeAndGetJsonString(settings);
+		await Verifier.VerifyJson(json);
+	}
+
+	[U]
+	public void CanDeserialize_StringifiedCreationDate()
+	{
+		var stream = WrapInStream(IndexSettingsJson);
+		var settings = _requestResponseSerializer.Deserialize<IndexSettings>(stream);
+		settings.CreationDate.Should().Be(1655895084631);
+	}
+}
diff --git a/tests/Tests/_VerifySnapshots/IndexSettingsSerializationTests.CanSerialize_CreationDate.verified.txt b/tests/Tests/_VerifySnapshots/IndexSettingsSerializationTests.CanSerialize_CreationDate.verified.txt
new file mode 100644
index 00000000000..ad17b8e3bca
--- /dev/null
+++ b/tests/Tests/_VerifySnapshots/IndexSettingsSerializationTests.CanSerialize_CreationDate.verified.txt
@@ -0,0 +1,3 @@
+{
+  creation_date: 1655895084631
+}
\ No newline at end of file
diff --git a/tests/Tests/_VerifySnapshots/IndexSettingsSerializationTests.CanSerialize_NullCreationDate.verified.txt b/tests/Tests/_VerifySnapshots/IndexSettingsSerializationTests.CanSerialize_NullCreationDate.verified.txt
new file mode 100644
index 00000000000..9e26dfeeb6e
--- /dev/null
+++ b/tests/Tests/_VerifySnapshots/IndexSettingsSerializationTests.CanSerialize_NullCreationDate.verified.txt
@@ -0,0 +1 @@
+{}
\ No newline at end of file