diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlsLookup.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlLookup.g.cs
similarity index 99%
rename from src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlsLookup.g.cs
rename to src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlLookup.g.cs
index 3969e65f34c..2d68d7927b3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlsLookup.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ApiUrlLookup.g.cs
@@ -15,8 +15,11 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 namespace Elastic.Clients.Elasticsearch.Requests;
-internal static class ApiUrlsLookups
+
+internal static class ApiUrlLookup
 {
 	internal static ApiUrls AsyncSearchStatus = new ApiUrls(new[] { "/_async_search/status/{id}" });
 	internal static ApiUrls AsyncSearchDelete = new ApiUrls(new[] { "/_async_search/{id}" });
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusRequest.g.cs
index eba1ac2d5a5..007f546ab98 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,26 +27,35 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
+
 public sealed class AsyncSearchStatusRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Retrieves the status of a previously submitted async search request given its ID.</para>
+/// </summary>
 public sealed partial class AsyncSearchStatusRequest : PlainRequest<AsyncSearchStatusRequestParameters>
 {
 	public AsyncSearchStatusRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchStatus;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchStatus;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Retrieves the status of a previously submitted async search request given its ID.</para>
+/// </summary>
 public sealed partial class AsyncSearchStatusRequestDescriptor<TDocument> : RequestDescriptor<AsyncSearchStatusRequestDescriptor<TDocument>, AsyncSearchStatusRequestParameters>
 {
 	internal AsyncSearchStatusRequestDescriptor(Action<AsyncSearchStatusRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public AsyncSearchStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -53,9 +64,12 @@ internal AsyncSearchStatusRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchStatus;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchStatus;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public AsyncSearchStatusRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -67,9 +81,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Retrieves the status of a previously submitted async search request given its ID.</para>
+/// </summary>
 public sealed partial class AsyncSearchStatusRequestDescriptor : RequestDescriptor<AsyncSearchStatusRequestDescriptor, AsyncSearchStatusRequestParameters>
 {
 	internal AsyncSearchStatusRequestDescriptor(Action<AsyncSearchStatusRequestDescriptor> configure) => configure.Invoke(this);
+
 	public AsyncSearchStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -78,9 +96,12 @@ internal AsyncSearchStatusRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchStatus;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchStatus;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public AsyncSearchStatusRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
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 e78764894e5..919368c258a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchStatusResponse.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
@@ -22,34 +24,26 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
+
 public sealed partial class AsyncSearchStatusResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("completion_status")]
 	public int? CompletionStatus { get; init; }
-
 	[JsonInclude, JsonPropertyName("expiration_time")]
 	public DateTimeOffset? ExpirationTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("expiration_time_in_millis")]
 	public long ExpirationTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
-
 	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
-
 	[JsonInclude, 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 long StartTimeInMillis { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/DeleteAsyncSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/DeleteAsyncSearchRequest.g.cs
index f57f61ec652..13eda4f39f2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/DeleteAsyncSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/DeleteAsyncSearchRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,26 +27,35 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
+
 public sealed class DeleteAsyncSearchRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Deletes an async search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted.</para>
+/// </summary>
 public sealed partial class DeleteAsyncSearchRequest : PlainRequest<DeleteAsyncSearchRequestParameters>
 {
 	public DeleteAsyncSearchRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Deletes an async search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted.</para>
+/// </summary>
 public sealed partial class DeleteAsyncSearchRequestDescriptor<TDocument> : RequestDescriptor<DeleteAsyncSearchRequestDescriptor<TDocument>, DeleteAsyncSearchRequestParameters>
 {
 	internal DeleteAsyncSearchRequestDescriptor(Action<DeleteAsyncSearchRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DeleteAsyncSearchRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -53,9 +64,12 @@ internal DeleteAsyncSearchRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public DeleteAsyncSearchRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -67,9 +81,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Deletes an async search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted.</para>
+/// </summary>
 public sealed partial class DeleteAsyncSearchRequestDescriptor : RequestDescriptor<DeleteAsyncSearchRequestDescriptor, DeleteAsyncSearchRequestParameters>
 {
 	internal DeleteAsyncSearchRequestDescriptor(Action<DeleteAsyncSearchRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeleteAsyncSearchRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -78,9 +96,12 @@ internal DeleteAsyncSearchRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public DeleteAsyncSearchRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/DeleteAsyncSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/DeleteAsyncSearchResponse.g.cs
index af8976df219..53ede513868 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/DeleteAsyncSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/DeleteAsyncSearchResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
+
 public sealed partial class DeleteAsyncSearchResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { 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 50839575db4..63882aa0d61 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,42 +27,67 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
+
 public sealed class GetAsyncSearchRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the time interval in which the results (partial or final) for this search will be available</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether aggregation and suggester names should be prefixed by their respective types in the response</para>
+	/// </summary>
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the time that the request should block waiting for the final response</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 }
 
+/// <summary>
+/// <para>Retrieves the results of a previously submitted async search request given its ID.</para>
+/// </summary>
 public sealed partial class GetAsyncSearchRequest : PlainRequest<GetAsyncSearchRequestParameters>
 {
 	public GetAsyncSearchRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Specify the time interval in which the results (partial or final) for this search will be available</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
+	/// <summary>
+	/// <para>Specify whether aggregation and suggester names should be prefixed by their respective types in the response</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
 
+	/// <summary>
+	/// <para>Specify the time that the request should block waiting for the final response</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 }
 
+/// <summary>
+/// <para>Retrieves the results of a previously submitted async search request given its ID.</para>
+/// </summary>
 public sealed partial class GetAsyncSearchRequestDescriptor<TDocument> : RequestDescriptor<GetAsyncSearchRequestDescriptor<TDocument>, GetAsyncSearchRequestParameters>
 {
 	internal GetAsyncSearchRequestDescriptor(Action<GetAsyncSearchRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetAsyncSearchRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -69,12 +96,16 @@ internal GetAsyncSearchRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	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.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+
 	public GetAsyncSearchRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -86,9 +117,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Retrieves the results of a previously submitted async search request given its ID.</para>
+/// </summary>
 public sealed partial class GetAsyncSearchRequestDescriptor : RequestDescriptor<GetAsyncSearchRequestDescriptor, GetAsyncSearchRequestParameters>
 {
 	internal GetAsyncSearchRequestDescriptor(Action<GetAsyncSearchRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetAsyncSearchRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -97,12 +132,16 @@ internal GetAsyncSearchRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	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.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 4b931d8f0c8..92e32556c43 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/GetAsyncSearchResponse.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
@@ -22,31 +24,24 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
+
 public sealed partial class GetAsyncSearchResponse<TDocument> : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("expiration_time")]
 	public DateTimeOffset? ExpirationTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("expiration_time_in_millis")]
 	public long ExpirationTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
-
 	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
-
 	[JsonInclude, 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 long StartTimeInMillis { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs
index 466898be79f..466ffc6c9d5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,104 +27,148 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
+
 public sealed class SubmitAsyncSearchRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the time that the request should block waiting for the final response</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Control whether the response should be stored in the cluster if it completed within the provided [wait_for_completion] time (default: false)</para>
+	/// </summary>
 	public bool? KeepOnCompletion { get => Q<bool?>("keep_on_completion"); set => Q("keep_on_completion", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Update the time interval in which the results (partial or final) for this search will be available</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Indicate if an error should be returned if there is a partial search failure or timeout</para>
+	/// </summary>
 	public bool? AllowPartialSearchResults { get => Q<bool?>("allow_partial_search_results"); set => Q("allow_partial_search_results", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The analyzer to use for the query string</para>
+	/// </summary>
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether wildcard and prefix queries should be analyzed (default: false)</para>
+	/// </summary>
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The number of shard results that should be reduced at once on the coordinating node. This value should be used as the granularity at which progress results will be made available.</para>
+	/// </summary>
 	public long? BatchedReduceSize { get => Q<long?>("batched_reduce_size"); set => Q("batched_reduce_size", value); }
-
-	[JsonIgnore]
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The field to use as default where no field prefix is given in the query string</para>
+	/// </summary>
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete, expanded or aliased indices should be ignored when throttled</para>
+	/// </summary>
 	public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The number of concurrent shard requests per node this search executes concurrently. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests</para>
+	/// </summary>
 	public long? MaxConcurrentShardRequests { get => Q<long?>("max_concurrent_shard_requests"); set => Q("max_concurrent_shard_requests", value); }
-
-	[JsonIgnore]
 	public string? MinCompatibleShardNode { get => Q<string?>("min_compatible_shard_node"); set => Q("min_compatible_shard_node", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
-
-	[JsonIgnore]
 	public long? PreFilterShardSize { get => Q<long?>("pre_filter_shard_size"); set => Q("pre_filter_shard_size", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify if request cache should be used for this request or not, defaults to true</para>
+	/// </summary>
 	public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of specific routing values</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
-
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specifies which field to use for suggestions.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Field? SuggestField { get => Q<Elastic.Clients.Elasticsearch.Field?>("suggest_field"); set => Q("suggest_field", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify suggest mode</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.SuggestMode? SuggestMode { get => Q<Elastic.Clients.Elasticsearch.SuggestMode?>("suggest_mode"); set => Q("suggest_mode", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>How many suggestions to return in response</para>
+	/// </summary>
 	public long? SuggestSize { get => Q<long?>("suggest_size"); set => Q("suggest_size", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The source text for which the suggestions should be returned.</para>
+	/// </summary>
 	public string? SuggestText { get => Q<string?>("suggest_text"); set => Q("suggest_text", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether aggregation and suggester names should be prefixed by their respective types in the response</para>
+	/// </summary>
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
-
-	[JsonIgnore]
 	public bool? RestTotalHitsAsInt { get => Q<bool?>("rest_total_hits_as_int"); set => Q("rest_total_hits_as_int", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A list of fields to exclude from the returned _source field</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A list of fields to extract and return from the _source field</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Query in the Lucene query string syntax</para>
+	/// </summary>
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 }
 
@@ -535,6 +581,9 @@ public override void Write(Utf8JsonWriter writer, SubmitAsyncSearchRequest value
 }
 
 [JsonConverter(typeof(SubmitAsyncSearchRequestConverter))]
+/// <summary>
+/// <para>Executes a search request asynchronously.</para>
+/// </summary>
 public sealed partial class SubmitAsyncSearchRequest : PlainRequest<SubmitAsyncSearchRequestParameters>
 {
 	public SubmitAsyncSearchRequest()
@@ -545,212 +594,354 @@ public SubmitAsyncSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchSubmit;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchSubmit;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Specify the time that the request should block waiting for the final response</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 
+	/// <summary>
+	/// <para>Control whether the response should be stored in the cluster if it completed within the provided [wait_for_completion] time (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? KeepOnCompletion { get => Q<bool?>("keep_on_completion"); set => Q("keep_on_completion", value); }
 
+	/// <summary>
+	/// <para>Update the time interval in which the results (partial or final) for this search will be available</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Indicate if an error should be returned if there is a partial search failure or timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowPartialSearchResults { get => Q<bool?>("allow_partial_search_results"); set => Q("allow_partial_search_results", value); }
 
+	/// <summary>
+	/// <para>The analyzer to use for the query string</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
+	/// <summary>
+	/// <para>Specify whether wildcard and prefix queries should be analyzed (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
+	/// <summary>
+	/// <para>The number of shard results that should be reduced at once on the coordinating node. This value should be used as the granularity at which progress results will be made available.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? BatchedReduceSize { get => Q<long?>("batched_reduce_size"); set => Q("batched_reduce_size", value); }
-
 	[JsonIgnore]
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
+	/// <summary>
+	/// <para>The field to use as default where no field prefix is given in the query string</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete, expanded or aliased indices should be ignored when throttled</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
+	/// <summary>
+	/// <para>The number of concurrent shard requests per node this search executes concurrently. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? MaxConcurrentShardRequests { get => Q<long?>("max_concurrent_shard_requests"); set => Q("max_concurrent_shard_requests", value); }
-
 	[JsonIgnore]
 	public string? MinCompatibleShardNode { get => Q<string?>("min_compatible_shard_node"); set => Q("min_compatible_shard_node", value); }
 
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
-
 	[JsonIgnore]
 	public long? PreFilterShardSize { get => Q<long?>("pre_filter_shard_size"); set => Q("pre_filter_shard_size", value); }
 
+	/// <summary>
+	/// <para>Specify if request cache should be used for this request or not, defaults to true</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of specific routing values</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
-
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
+	/// <summary>
+	/// <para>Specifies which field to use for suggestions.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Field? SuggestField { get => Q<Elastic.Clients.Elasticsearch.Field?>("suggest_field"); set => Q("suggest_field", value); }
 
+	/// <summary>
+	/// <para>Specify suggest mode</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.SuggestMode? SuggestMode { get => Q<Elastic.Clients.Elasticsearch.SuggestMode?>("suggest_mode"); set => Q("suggest_mode", value); }
 
+	/// <summary>
+	/// <para>How many suggestions to return in response</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? SuggestSize { get => Q<long?>("suggest_size"); set => Q("suggest_size", value); }
 
+	/// <summary>
+	/// <para>The source text for which the suggestions should be returned.</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? SuggestText { get => Q<string?>("suggest_text"); set => Q("suggest_text", value); }
 
+	/// <summary>
+	/// <para>Specify whether aggregation and suggester names should be prefixed by their respective types in the response</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
-
 	[JsonIgnore]
 	public bool? RestTotalHitsAsInt { get => Q<bool?>("rest_total_hits_as_int"); set => Q("rest_total_hits_as_int", value); }
 
+	/// <summary>
+	/// <para>A list of fields to exclude from the returned _source field</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
+	/// <summary>
+	/// <para>A list of fields to extract and return from the _source field</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
+	/// <summary>
+	/// <para>Query in the Lucene query string syntax</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
-
 	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? Collapse { get; set; }
 
+	/// <summary>
+	/// <para>If true, returns detailed information about score computation as part of a hit.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
+	/// <summary>
+	/// <para>Configuration of search extensions defined by Elasticsearch plugins.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("ext")]
 	public IDictionary<string, object>? Ext { get; set; }
 
+	/// <summary>
+	/// <para>Starting document offset. By default, you cannot page through more than 10,000<br/>hits using the from and size parameters. To page through more hits, use the<br/>search_after parameter.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
-
 	[JsonInclude, JsonPropertyName("highlight")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Highlight? Highlight { get; set; }
 
+	/// <summary>
+	/// <para>Number of hits matching the query to count accurately. If true, the exact<br/>number of hits is returned at the cost of some performance. If false, the<br/>response does not include the total number of hits matching the query.<br/>Defaults to 10,000 hits.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("track_total_hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHits { get; set; }
 
+	/// <summary>
+	/// <para>Boosts the _score of documents from specified indices.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("indices_boost")]
 	public ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? IndicesBoost { get; set; }
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns doc values for field<br/>names matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("docvalue_fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
 
+	/// <summary>
+	/// <para>Defines the approximate kNN search to run.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("knn")]
 	public Elastic.Clients.Elasticsearch.KnnQuery? Knn { get; set; }
 
+	/// <summary>
+	/// <para>Minimum _score for matching documents. Documents with a lower _score are<br/>not included in the search results.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("min_score")]
 	public double? MinScore { get; set; }
-
 	[JsonInclude, JsonPropertyName("post_filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilter { get; set; }
-
 	[JsonInclude, JsonPropertyName("profile")]
 	public bool? Profile { get; set; }
 
+	/// <summary>
+	/// <para>Defines the search definition using the Query DSL.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("rescore"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Core.Search.Rescore))]
 	public ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>? Rescore { get; set; }
 
+	/// <summary>
+	/// <para>Retrieve a script evaluation (based on different fields) for each hit.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfter { get; set; }
 
+	/// <summary>
+	/// <para>The number of hits to return. By default, you cannot page through more<br/>than 10,000 hits using the from and size parameters. To page through more<br/>hits, use the search_after parameter.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
-
 	[JsonInclude, JsonPropertyName("slice")]
 	public Elastic.Clients.Elasticsearch.SlicedScroll? Slice { get; set; }
-
 	[JsonInclude, JsonPropertyName("sort"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 
+	/// <summary>
+	/// <para>Indicates which source fields are returned for matching documents. These<br/>fields are returned in the hits._source property of the search response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns values for field names<br/>matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("suggest")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Suggester? Suggest { get; set; }
 
+	/// <summary>
+	/// <para>Maximum number of documents to collect for each shard. If a query reaches this<br/>limit, Elasticsearch terminates the query early. Elasticsearch collects documents<br/>before sorting. Defaults to 0, which does not terminate query execution early.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("terminate_after")]
 	public long? TerminateAfter { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the period of time to wait for a response from each shard. If no response<br/>is received before the timeout expires, the request fails and returns an error.<br/>Defaults to no timeout.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("timeout")]
 	public string? Timeout { get; set; }
 
+	/// <summary>
+	/// <para>If true, calculate and return document scores, even if the scores are not used for sorting.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("track_scores")]
 	public bool? TrackScores { get; set; }
 
+	/// <summary>
+	/// <para>If true, returns document version as part of a hit.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 
+	/// <summary>
+	/// <para>If true, returns sequence number and primary term of the last modification<br/>of each hit. See Optimistic concurrency control.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("seq_no_primary_term")]
 	public bool? SeqNoPrimaryTerm { get; set; }
 
+	/// <summary>
+	/// <para>List of stored fields to return as part of a hit. If no fields are specified,<br/>no stored fields are included in the response. If this field is specified, the _source<br/>parameter defaults to false. You can pass _source: true to return both source fields<br/>and stored fields in the search response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("stored_fields")]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get; set; }
 
+	/// <summary>
+	/// <para>Limits the search to a point in time (PIT). If you provide a PIT, you<br/>cannot specify an <index> in the request path.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("pit")]
 	public Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? Pit { get; set; }
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
+	/// <summary>
+	/// <para>Stats groups to associate with the search. Each group maintains a statistics<br/>aggregation for its associated searches. You can retrieve these stats using<br/>the indices stats API.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("stats")]
 	public ICollection<string>? Stats { get; set; }
 }
 
+/// <summary>
+/// <para>Executes a search request asynchronously.</para>
+/// </summary>
 public sealed partial class SubmitAsyncSearchRequestDescriptor<TDocument> : RequestDescriptor<SubmitAsyncSearchRequestDescriptor<TDocument>, SubmitAsyncSearchRequestParameters>
 {
 	internal SubmitAsyncSearchRequestDescriptor(Action<SubmitAsyncSearchRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SubmitAsyncSearchRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchSubmit;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchSubmit;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public SubmitAsyncSearchRequestDescriptor<TDocument> SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public SubmitAsyncSearchRequestDescriptor<TDocument> SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
 	public SubmitAsyncSearchRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
@@ -783,6 +974,7 @@ public SubmitAsyncSearchRequestDescriptor()
 	public SubmitAsyncSearchRequestDescriptor<TDocument> SuggestText(string? suggestText) => Qs("suggest_text", suggestText);
 	public SubmitAsyncSearchRequestDescriptor<TDocument> TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
 	public SubmitAsyncSearchRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -790,127 +982,66 @@ public SubmitAsyncSearchRequestDescriptor<TDocument> Indices(Elastic.Clients.Ela
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; }
-
 	private Core.Search.FieldCollapseDescriptor<TDocument> CollapseDescriptor { get; set; }
-
 	private Action<Core.Search.FieldCollapseDescriptor<TDocument>> CollapseDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor<TDocument> DocvalueFieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>> DocvalueFieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>>[] DocvalueFieldsDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? FieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor<TDocument> FieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>> FieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>>[] FieldsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Highlight? HighlightValue { get; set; }
-
 	private Core.Search.HighlightDescriptor<TDocument> HighlightDescriptor { get; set; }
-
 	private Action<Core.Search.HighlightDescriptor<TDocument>> HighlightDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }
-
 	private KnnQueryDescriptor<TDocument> KnnDescriptor { get; set; }
-
 	private Action<KnnQueryDescriptor<TDocument>> KnnDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> PostFilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> PostFilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>? RescoreValue { get; set; }
-
 	private Core.Search.RescoreDescriptor<TDocument> RescoreDescriptor { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor<TDocument>> RescoreDescriptorAction { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor<TDocument>>[] RescoreDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; }
-
 	private SlicedScrollDescriptor<TDocument> SliceDescriptor { get; set; }
-
 	private Action<SlicedScrollDescriptor<TDocument>> SliceDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor<TDocument> SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private bool? ExplainValue { get; set; }
-
 	private IDictionary<string, object>? ExtValue { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? IndicesBoostValue { get; set; }
-
 	private double? MinScoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? PitValue { get; set; }
-
 	private Core.Search.PointInTimeReferenceDescriptor PitDescriptor { get; set; }
-
 	private Action<Core.Search.PointInTimeReferenceDescriptor> PitDescriptorAction { get; set; }
-
 	private bool? ProfileValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFieldsValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfterValue { get; set; }
-
 	private bool? SeqNoPrimaryTermValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private ICollection<string>? StatsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Suggester? SuggestValue { get; set; }
-
 	private Core.Search.SuggesterDescriptor SuggestDescriptor { get; set; }
-
 	private Action<Core.Search.SuggesterDescriptor> SuggestDescriptorAction { get; set; }
-
 	private long? TerminateAfterValue { get; set; }
-
 	private string? TimeoutValue { get; set; }
-
 	private bool? TrackScoresValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHitsValue { get; set; }
-
 	private bool? VersionValue { get; set; }
 
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -961,6 +1092,9 @@ public SubmitAsyncSearchRequestDescriptor<TDocument> Collapse(Action<Core.Search
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns doc values for field<br/>names matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> DocvalueFields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? docvalueFields)
 	{
 		DocvalueFieldsDescriptor = null;
@@ -997,6 +1131,9 @@ public SubmitAsyncSearchRequestDescriptor<TDocument> DocvalueFields(params Actio
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns values for field names<br/>matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Fields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? fields)
 	{
 		FieldsDescriptor = null;
@@ -1057,6 +1194,9 @@ public SubmitAsyncSearchRequestDescriptor<TDocument> Highlight(Action<Core.Searc
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the approximate kNN search to run.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
 	{
 		KnnDescriptor = null;
@@ -1105,6 +1245,9 @@ public SubmitAsyncSearchRequestDescriptor<TDocument> PostFilter(Action<QueryDsl.
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the search definition using the Query DSL.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
 	{
 		QueryDescriptor = null;
@@ -1225,42 +1368,63 @@ public SubmitAsyncSearchRequestDescriptor<TDocument> Sort(params Action<SortOpti
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Indicates which source fields are returned for matching documents. These<br/>fields are returned in the hits._source property of the search response.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source)
 	{
 		SourceValue = source;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns detailed information about score computation as part of a hit.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Explain(bool? explain = true)
 	{
 		ExplainValue = explain;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Configuration of search extensions defined by Elasticsearch plugins.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Ext(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		ExtValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Starting document offset. By default, you cannot page through more than 10,000<br/>hits using the from and size parameters. To page through more hits, use the<br/>search_after parameter.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> From(int? from)
 	{
 		FromValue = from;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Boosts the _score of documents from specified indices.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> IndicesBoost(ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? indicesBoost)
 	{
 		IndicesBoostValue = indicesBoost;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Minimum _score for matching documents. Documents with a lower _score are<br/>not included in the search results.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> MinScore(double? minScore)
 	{
 		MinScoreValue = minScore;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Limits the search to a point in time (PIT). If you provide a PIT, you<br/>cannot specify an <index> in the request path.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Pit(Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? pit)
 	{
 		PitDescriptor = null;
@@ -1291,12 +1455,18 @@ public SubmitAsyncSearchRequestDescriptor<TDocument> Profile(bool? profile = tru
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> RuntimeMappings(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeMappingsValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Retrieve a script evaluation (based on different fields) for each hit.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> ScriptFields(Func<FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>, FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>> selector)
 	{
 		ScriptFieldsValue = selector?.Invoke(new FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>());
@@ -1309,24 +1479,36 @@ public SubmitAsyncSearchRequestDescriptor<TDocument> SearchAfter(ICollection<Ela
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns sequence number and primary term of the last modification<br/>of each hit. See Optimistic concurrency control.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> SeqNoPrimaryTerm(bool? seqNoPrimaryTerm = true)
 	{
 		SeqNoPrimaryTermValue = seqNoPrimaryTerm;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The number of hits to return. By default, you cannot page through more<br/>than 10,000 hits using the from and size parameters. To page through more<br/>hits, use the search_after parameter.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Size(int? size)
 	{
 		SizeValue = size;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Stats groups to associate with the search. Each group maintains a statistics<br/>aggregation for its associated searches. You can retrieve these stats using<br/>the indices stats API.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Stats(ICollection<string>? stats)
 	{
 		StatsValue = stats;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>List of stored fields to return as part of a hit. If no fields are specified,<br/>no stored fields are included in the response. If this field is specified, the _source<br/>parameter defaults to false. You can pass _source: true to return both source fields<br/>and stored fields in the search response.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields)
 	{
 		StoredFieldsValue = storedFields;
@@ -1357,30 +1539,45 @@ public SubmitAsyncSearchRequestDescriptor<TDocument> Suggest(Action<Core.Search.
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Maximum number of documents to collect for each shard. If a query reaches this<br/>limit, Elasticsearch terminates the query early. Elasticsearch collects documents<br/>before sorting. Defaults to 0, which does not terminate query execution early.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> TerminateAfter(long? terminateAfter)
 	{
 		TerminateAfterValue = terminateAfter;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the period of time to wait for a response from each shard. If no response<br/>is received before the timeout expires, the request fails and returns an error.<br/>Defaults to no timeout.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Timeout(string? timeout)
 	{
 		TimeoutValue = timeout;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, calculate and return document scores, even if the scores are not used for sorting.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> TrackScores(bool? trackScores = true)
 	{
 		TrackScoresValue = trackScores;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Number of hits matching the query to count accurately. If true, the exact<br/>number of hits is returned at the cost of some performance. If false, the<br/>response does not include the total number of hits matching the query.<br/>Defaults to 10,000 hits.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> TrackTotalHits(Elastic.Clients.Elasticsearch.Core.Search.TrackHits? trackTotalHits)
 	{
 		TrackTotalHitsValue = trackTotalHits;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns document version as part of a hit.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor<TDocument> Version(bool? version = true)
 	{
 		VersionValue = version;
@@ -1772,16 +1969,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Executes a search request asynchronously.</para>
+/// </summary>
 public sealed partial class SubmitAsyncSearchRequestDescriptor : RequestDescriptor<SubmitAsyncSearchRequestDescriptor, SubmitAsyncSearchRequestParameters>
 {
 	internal SubmitAsyncSearchRequestDescriptor(Action<SubmitAsyncSearchRequestDescriptor> configure) => configure.Invoke(this);
+
 	public SubmitAsyncSearchRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.AsyncSearchSubmit;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.AsyncSearchSubmit;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public SubmitAsyncSearchRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public SubmitAsyncSearchRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
 	public SubmitAsyncSearchRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
@@ -1814,6 +2018,7 @@ public SubmitAsyncSearchRequestDescriptor()
 	public SubmitAsyncSearchRequestDescriptor SuggestText(string? suggestText) => Qs("suggest_text", suggestText);
 	public SubmitAsyncSearchRequestDescriptor TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
 	public SubmitAsyncSearchRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+
 	public SubmitAsyncSearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -1821,127 +2026,66 @@ public SubmitAsyncSearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; }
-
 	private Core.Search.FieldCollapseDescriptor CollapseDescriptor { get; set; }
-
 	private Action<Core.Search.FieldCollapseDescriptor> CollapseDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor DocvalueFieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor> DocvalueFieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor>[] DocvalueFieldsDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? FieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor FieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor> FieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor>[] FieldsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Highlight? HighlightValue { get; set; }
-
 	private Core.Search.HighlightDescriptor HighlightDescriptor { get; set; }
-
 	private Action<Core.Search.HighlightDescriptor> HighlightDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }
-
 	private KnnQueryDescriptor KnnDescriptor { get; set; }
-
 	private Action<KnnQueryDescriptor> KnnDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor PostFilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> PostFilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>? RescoreValue { get; set; }
-
 	private Core.Search.RescoreDescriptor RescoreDescriptor { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor> RescoreDescriptorAction { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor>[] RescoreDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; }
-
 	private SlicedScrollDescriptor SliceDescriptor { get; set; }
-
 	private Action<SlicedScrollDescriptor> SliceDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private bool? ExplainValue { get; set; }
-
 	private IDictionary<string, object>? ExtValue { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? IndicesBoostValue { get; set; }
-
 	private double? MinScoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? PitValue { get; set; }
-
 	private Core.Search.PointInTimeReferenceDescriptor PitDescriptor { get; set; }
-
 	private Action<Core.Search.PointInTimeReferenceDescriptor> PitDescriptorAction { get; set; }
-
 	private bool? ProfileValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFieldsValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfterValue { get; set; }
-
 	private bool? SeqNoPrimaryTermValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private ICollection<string>? StatsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Suggester? SuggestValue { get; set; }
-
 	private Core.Search.SuggesterDescriptor SuggestDescriptor { get; set; }
-
 	private Action<Core.Search.SuggesterDescriptor> SuggestDescriptorAction { get; set; }
-
 	private long? TerminateAfterValue { get; set; }
-
 	private string? TimeoutValue { get; set; }
-
 	private bool? TrackScoresValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHitsValue { get; set; }
-
 	private bool? VersionValue { get; set; }
 
 	public SubmitAsyncSearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -1992,6 +2136,9 @@ public SubmitAsyncSearchRequestDescriptor Collapse(Action<Core.Search.FieldColla
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns doc values for field<br/>names matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor DocvalueFields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? docvalueFields)
 	{
 		DocvalueFieldsDescriptor = null;
@@ -2028,6 +2175,9 @@ public SubmitAsyncSearchRequestDescriptor DocvalueFields(params Action<QueryDsl.
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns values for field names<br/>matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor Fields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? fields)
 	{
 		FieldsDescriptor = null;
@@ -2088,6 +2238,9 @@ public SubmitAsyncSearchRequestDescriptor Highlight(Action<Core.Search.Highlight
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the approximate kNN search to run.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
 	{
 		KnnDescriptor = null;
@@ -2136,6 +2289,9 @@ public SubmitAsyncSearchRequestDescriptor PostFilter(Action<QueryDsl.QueryDescri
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the search definition using the Query DSL.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
 	{
 		QueryDescriptor = null;
@@ -2256,42 +2412,63 @@ public SubmitAsyncSearchRequestDescriptor Sort(params Action<SortOptionsDescript
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Indicates which source fields are returned for matching documents. These<br/>fields are returned in the hits._source property of the search response.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source)
 	{
 		SourceValue = source;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns detailed information about score computation as part of a hit.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor Explain(bool? explain = true)
 	{
 		ExplainValue = explain;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Configuration of search extensions defined by Elasticsearch plugins.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor Ext(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		ExtValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Starting document offset. By default, you cannot page through more than 10,000<br/>hits using the from and size parameters. To page through more hits, use the<br/>search_after parameter.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor From(int? from)
 	{
 		FromValue = from;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Boosts the _score of documents from specified indices.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor IndicesBoost(ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? indicesBoost)
 	{
 		IndicesBoostValue = indicesBoost;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Minimum _score for matching documents. Documents with a lower _score are<br/>not included in the search results.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor MinScore(double? minScore)
 	{
 		MinScoreValue = minScore;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Limits the search to a point in time (PIT). If you provide a PIT, you<br/>cannot specify an <index> in the request path.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor Pit(Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? pit)
 	{
 		PitDescriptor = null;
@@ -2322,12 +2499,18 @@ public SubmitAsyncSearchRequestDescriptor Profile(bool? profile = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor RuntimeMappings(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeMappingsValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Retrieve a script evaluation (based on different fields) for each hit.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor ScriptFields(Func<FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>, FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>> selector)
 	{
 		ScriptFieldsValue = selector?.Invoke(new FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>());
@@ -2340,24 +2523,36 @@ public SubmitAsyncSearchRequestDescriptor SearchAfter(ICollection<Elastic.Client
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns sequence number and primary term of the last modification<br/>of each hit. See Optimistic concurrency control.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor SeqNoPrimaryTerm(bool? seqNoPrimaryTerm = true)
 	{
 		SeqNoPrimaryTermValue = seqNoPrimaryTerm;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The number of hits to return. By default, you cannot page through more<br/>than 10,000 hits using the from and size parameters. To page through more<br/>hits, use the search_after parameter.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor Size(int? size)
 	{
 		SizeValue = size;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Stats groups to associate with the search. Each group maintains a statistics<br/>aggregation for its associated searches. You can retrieve these stats using<br/>the indices stats API.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor Stats(ICollection<string>? stats)
 	{
 		StatsValue = stats;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>List of stored fields to return as part of a hit. If no fields are specified,<br/>no stored fields are included in the response. If this field is specified, the _source<br/>parameter defaults to false. You can pass _source: true to return both source fields<br/>and stored fields in the search response.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields)
 	{
 		StoredFieldsValue = storedFields;
@@ -2388,30 +2583,45 @@ public SubmitAsyncSearchRequestDescriptor Suggest(Action<Core.Search.SuggesterDe
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Maximum number of documents to collect for each shard. If a query reaches this<br/>limit, Elasticsearch terminates the query early. Elasticsearch collects documents<br/>before sorting. Defaults to 0, which does not terminate query execution early.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor TerminateAfter(long? terminateAfter)
 	{
 		TerminateAfterValue = terminateAfter;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the period of time to wait for a response from each shard. If no response<br/>is received before the timeout expires, the request fails and returns an error.<br/>Defaults to no timeout.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor Timeout(string? timeout)
 	{
 		TimeoutValue = timeout;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, calculate and return document scores, even if the scores are not used for sorting.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor TrackScores(bool? trackScores = true)
 	{
 		TrackScoresValue = trackScores;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Number of hits matching the query to count accurately. If true, the exact<br/>number of hits is returned at the cost of some performance. If false, the<br/>response does not include the total number of hits matching the query.<br/>Defaults to 10,000 hits.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor TrackTotalHits(Elastic.Clients.Elasticsearch.Core.Search.TrackHits? trackTotalHits)
 	{
 		TrackTotalHitsValue = trackTotalHits;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns document version as part of a hit.</para>
+	/// </summary>
 	public SubmitAsyncSearchRequestDescriptor Version(bool? version = true)
 	{
 		VersionValue = version;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchResponse.g.cs
index 64a29b440ff..a923dc3cfc3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchResponse.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
@@ -22,31 +24,24 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
+
 public sealed partial class SubmitAsyncSearchResponse<TDocument> : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("expiration_time")]
 	public DateTimeOffset? ExpirationTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("expiration_time_in_millis")]
 	public long ExpirationTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
-
 	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
-
 	[JsonInclude, 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 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 5245d65133a..2e5d1812145 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,38 +27,59 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class BulkRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The pipeline id to preprocess incoming documents with</para>
+	/// </summary>
 	public string? Pipeline { get => Q<string?>("pipeline"); set => Q("pipeline", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Refresh?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or default list of fields to return, can be overridden on each sub-request</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Default list of fields to exclude from the returned _source field, can be overridden on each sub-request</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Default list of fields to extract and return from the _source field, can be overridden on each sub-request</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the bulk operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Sets require_alias for all incoming documents. Defaults to unset (false)</para>
+	/// </summary>
 	public bool? RequireAlias { get => Q<bool?>("require_alias"); set => Q("require_alias", value); }
 }
 
+/// <summary>
+/// <para>Allows to perform multiple index/update/delete operations in a single request.</para>
+/// </summary>
 public sealed partial class BulkRequest : PlainRequest<BulkRequestParameters>
 {
 	public BulkRequest()
@@ -67,47 +90,84 @@ public BulkRequest(Elastic.Clients.Elasticsearch.IndexName? index) : base(r => r
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceBulk;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceBulk;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>The pipeline id to preprocess incoming documents with</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Pipeline { get => Q<string?>("pipeline"); set => Q("pipeline", value); }
 
+	/// <summary>
+	/// <para>If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Refresh?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or default list of fields to return, can be overridden on each sub-request</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
+	/// <summary>
+	/// <para>Default list of fields to exclude from the returned _source field, can be overridden on each sub-request</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
+	/// <summary>
+	/// <para>Default list of fields to extract and return from the _source field, can be overridden on each sub-request</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the bulk operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
+	/// <summary>
+	/// <para>Sets require_alias for all incoming documents. Defaults to unset (false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? RequireAlias { get => Q<bool?>("require_alias"); set => Q("require_alias", value); }
 }
 
+/// <summary>
+/// <para>Allows to perform multiple index/update/delete operations in a single request.</para>
+/// </summary>
 public sealed partial class BulkRequestDescriptor<TDocument> : RequestDescriptor<BulkRequestDescriptor<TDocument>, BulkRequestParameters>
 {
 	internal BulkRequestDescriptor(Action<BulkRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public BulkRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceBulk;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceBulk;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public BulkRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public BulkRequestDescriptor<TDocument> SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public BulkRequestDescriptor<TDocument> SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -117,6 +177,7 @@ public BulkRequestDescriptor()
 	public BulkRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	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)
 	{
 		RouteValues.Optional("index", index);
@@ -128,16 +189,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Allows to perform multiple index/update/delete operations in a single request.</para>
+/// </summary>
 public sealed partial class BulkRequestDescriptor : RequestDescriptor<BulkRequestDescriptor, BulkRequestParameters>
 {
 	internal BulkRequestDescriptor(Action<BulkRequestDescriptor> configure) => configure.Invoke(this);
+
 	public BulkRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceBulk;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceBulk;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public BulkRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public BulkRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public BulkRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -147,6 +215,7 @@ public BulkRequestDescriptor()
 	public BulkRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	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)
 	{
 		RouteValues.Optional("index", index);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkResponse.g.cs
index 4610e022177..865d68f1ecb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkResponse.g.cs
@@ -15,22 +15,22 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class BulkResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("errors")]
 	public bool Errors { get; init; }
-
 	[JsonInclude, JsonPropertyName("ingest_took")]
 	public long? IngestTook { get; init; }
-
 	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClearScrollRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClearScrollRequest.g.cs
index 8c7fec45fb5..231db5e5861 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClearScrollRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClearScrollRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,31 +27,44 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class ClearScrollRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Explicitly clears the search context for a scroll.</para>
+/// </summary>
 public sealed partial class ClearScrollRequest : PlainRequest<ClearScrollRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceClearScroll;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceClearScroll;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => true;
+
 	[JsonInclude, JsonPropertyName("scroll_id")]
 	public Elastic.Clients.Elasticsearch.ScrollIds? ScrollId { get; set; }
 }
 
+/// <summary>
+/// <para>Explicitly clears the search context for a scroll.</para>
+/// </summary>
 public sealed partial class ClearScrollRequestDescriptor : RequestDescriptor<ClearScrollRequestDescriptor, ClearScrollRequestParameters>
 {
 	internal ClearScrollRequestDescriptor(Action<ClearScrollRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ClearScrollRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceClearScroll;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceClearScroll;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => true;
+
 	private Elastic.Clients.Elasticsearch.ScrollIds? ScrollIdValue { get; set; }
 
 	public ClearScrollRequestDescriptor ScrollId(Elastic.Clients.Elasticsearch.ScrollIds? scrollId)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClearScrollResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClearScrollResponse.g.cs
index aa5a3dd617b..d2e4efeca16 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClearScrollResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClearScrollResponse.g.cs
@@ -15,19 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ClearScrollResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("num_freed")]
 	public int NumFreed { get; init; }
-
 	[JsonInclude, JsonPropertyName("succeeded")]
 	public bool Succeeded { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClosePointInTimeRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClosePointInTimeRequest.g.cs
index 939aa120527..f20262058bc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClosePointInTimeRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClosePointInTimeRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,31 +27,44 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class ClosePointInTimeRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Close a point in time</para>
+/// </summary>
 public sealed partial class ClosePointInTimeRequest : PlainRequest<ClosePointInTimeRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceClosePointInTime;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceClosePointInTime;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => true;
+
 	[JsonInclude, JsonPropertyName("id")]
 	public Elastic.Clients.Elasticsearch.Id Id { get; set; }
 }
 
+/// <summary>
+/// <para>Close a point in time</para>
+/// </summary>
 public sealed partial class ClosePointInTimeRequestDescriptor : RequestDescriptor<ClosePointInTimeRequestDescriptor, ClosePointInTimeRequestParameters>
 {
 	internal ClosePointInTimeRequestDescriptor(Action<ClosePointInTimeRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ClosePointInTimeRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceClosePointInTime;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceClosePointInTime;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => true;
+
 	private Elastic.Clients.Elasticsearch.Id IdValue { get; set; }
 
 	public ClosePointInTimeRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClosePointInTimeResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClosePointInTimeResponse.g.cs
index df3c699c0f7..44a6e801a67 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClosePointInTimeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ClosePointInTimeResponse.g.cs
@@ -15,19 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ClosePointInTimeResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("num_freed")]
 	public int NumFreed { get; init; }
-
 	[JsonInclude, JsonPropertyName("succeeded")]
 	public bool Succeeded { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthRequest.g.cs
index 0a90ac73684..0dfb669339d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,44 +27,69 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Cluster;
+
 public sealed class HealthRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Can be one of cluster, indices or shards. Controls the details level of the health information returned.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Level? Level { get => Q<Elastic.Clients.Elasticsearch.Level?>("level"); set => Q("level", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, the request retrieves information from the local node only. Defaults to false, which means information is retrieved from the master node.</para>
+	/// </summary>
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A number controlling to how many active shards to wait for, all to wait for all shards in the cluster to be active, or 0 to not wait.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Can be one of immediate, urgent, high, normal, low, languid. Wait until all currently queued events with the given priority are processed.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForEvents? WaitForEvents { get => Q<Elastic.Clients.Elasticsearch.WaitForEvents?>("wait_for_events"); set => Q("wait_for_events", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The request waits until the specified number N of nodes is available. It also accepts >=N, <=N, >N and <N. Alternatively, it is possible to use ge(N), le(N), gt(N) and lt(N) notation.</para>
+	/// </summary>
 	public Union<string?, int?>? WaitForNodes { get => Q<Union<string?, int?>?>("wait_for_nodes"); set => Q("wait_for_nodes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A boolean value which controls whether to wait (until the timeout provided) for the cluster to have no shard initializations. Defaults to false, which means it will not wait for initializing shards.</para>
+	/// </summary>
 	public bool? WaitForNoInitializingShards { get => Q<bool?>("wait_for_no_initializing_shards"); set => Q("wait_for_no_initializing_shards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A boolean value which controls whether to wait (until the timeout provided) for the cluster to have no shard relocations. Defaults to false, which means it will not wait for relocating shards.</para>
+	/// </summary>
 	public bool? WaitForNoRelocatingShards { get => Q<bool?>("wait_for_no_relocating_shards"); set => Q("wait_for_no_relocating_shards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>One of green, yellow or red. Will wait (until the timeout provided) until the status of the cluster changes to the one provided or better, i.e. green > yellow > red. By default, will not wait for any status.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.HealthStatus? WaitForStatus { get => Q<Elastic.Clients.Elasticsearch.HealthStatus?>("wait_for_status"); set => Q("wait_for_status", value); }
 }
 
+/// <summary>
+/// <para>The cluster health API returns a simple status on the health of the cluster. You can also use the API to get the health status of only specified data streams and indices. For data streams, the API retrieves the health status of the stream’s backing indices.<br/>The cluster health status is: green, yellow or red. On the shard level, a red status indicates that the specific shard is not allocated in the cluster, yellow means that the primary shard is allocated but replicas are not, and green means that all shards are allocated. The index level status is controlled by the worst shard status. The cluster status is controlled by the worst index status.</para>
+/// </summary>
 public sealed partial class HealthRequest : PlainRequest<HealthRequestParameters>
 {
 	public HealthRequest()
@@ -73,53 +100,96 @@ public HealthRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.ClusterHealth;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.ClusterHealth;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Can be one of cluster, indices or shards. Controls the details level of the health information returned.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Level? Level { get => Q<Elastic.Clients.Elasticsearch.Level?>("level"); set => Q("level", value); }
 
+	/// <summary>
+	/// <para>If true, the request retrieves information from the local node only. Defaults to false, which means information is retrieved from the master node.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>A number controlling to how many active shards to wait for, all to wait for all shards in the cluster to be active, or 0 to not wait.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
+	/// <summary>
+	/// <para>Can be one of immediate, urgent, high, normal, low, languid. Wait until all currently queued events with the given priority are processed.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForEvents? WaitForEvents { get => Q<Elastic.Clients.Elasticsearch.WaitForEvents?>("wait_for_events"); set => Q("wait_for_events", value); }
 
+	/// <summary>
+	/// <para>The request waits until the specified number N of nodes is available. It also accepts >=N, <=N, >N and <N. Alternatively, it is possible to use ge(N), le(N), gt(N) and lt(N) notation.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Union<string?, int?>? WaitForNodes { get => Q<Union<string?, int?>?>("wait_for_nodes"); set => Q("wait_for_nodes", value); }
 
+	/// <summary>
+	/// <para>A boolean value which controls whether to wait (until the timeout provided) for the cluster to have no shard initializations. Defaults to false, which means it will not wait for initializing shards.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? WaitForNoInitializingShards { get => Q<bool?>("wait_for_no_initializing_shards"); set => Q("wait_for_no_initializing_shards", value); }
 
+	/// <summary>
+	/// <para>A boolean value which controls whether to wait (until the timeout provided) for the cluster to have no shard relocations. Defaults to false, which means it will not wait for relocating shards.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? WaitForNoRelocatingShards { get => Q<bool?>("wait_for_no_relocating_shards"); set => Q("wait_for_no_relocating_shards", value); }
 
+	/// <summary>
+	/// <para>One of green, yellow or red. Will wait (until the timeout provided) until the status of the cluster changes to the one provided or better, i.e. green > yellow > red. By default, will not wait for any status.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.HealthStatus? WaitForStatus { get => Q<Elastic.Clients.Elasticsearch.HealthStatus?>("wait_for_status"); set => Q("wait_for_status", value); }
 }
 
+/// <summary>
+/// <para>The cluster health API returns a simple status on the health of the cluster. You can also use the API to get the health status of only specified data streams and indices. For data streams, the API retrieves the health status of the stream’s backing indices.<br/>The cluster health status is: green, yellow or red. On the shard level, a red status indicates that the specific shard is not allocated in the cluster, yellow means that the primary shard is allocated but replicas are not, and green means that all shards are allocated. The index level status is controlled by the worst shard status. The cluster status is controlled by the worst index status.</para>
+/// </summary>
 public sealed partial class HealthRequestDescriptor<TDocument> : RequestDescriptor<HealthRequestDescriptor<TDocument>, HealthRequestParameters>
 {
 	internal HealthRequestDescriptor(Action<HealthRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public HealthRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.ClusterHealth;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.ClusterHealth;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public HealthRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public HealthRequestDescriptor<TDocument> Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level);
 	public HealthRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
@@ -131,6 +201,7 @@ public HealthRequestDescriptor()
 	public HealthRequestDescriptor<TDocument> WaitForNoRelocatingShards(bool? waitForNoRelocatingShards = true) => Qs("wait_for_no_relocating_shards", waitForNoRelocatingShards);
 	public HealthRequestDescriptor<TDocument> WaitForNodes(Union<string?, int?>? waitForNodes) => Qs("wait_for_nodes", waitForNodes);
 	public HealthRequestDescriptor<TDocument> WaitForStatus(Elastic.Clients.Elasticsearch.HealthStatus? waitForStatus) => Qs("wait_for_status", waitForStatus);
+
 	public HealthRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -142,16 +213,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>The cluster health API returns a simple status on the health of the cluster. You can also use the API to get the health status of only specified data streams and indices. For data streams, the API retrieves the health status of the stream’s backing indices.<br/>The cluster health status is: green, yellow or red. On the shard level, a red status indicates that the specific shard is not allocated in the cluster, yellow means that the primary shard is allocated but replicas are not, and green means that all shards are allocated. The index level status is controlled by the worst shard status. The cluster status is controlled by the worst index status.</para>
+/// </summary>
 public sealed partial class HealthRequestDescriptor : RequestDescriptor<HealthRequestDescriptor, HealthRequestParameters>
 {
 	internal HealthRequestDescriptor(Action<HealthRequestDescriptor> configure) => configure.Invoke(this);
+
 	public HealthRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.ClusterHealth;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.ClusterHealth;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public HealthRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public HealthRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level);
 	public HealthRequestDescriptor Local(bool? local = true) => Qs("local", local);
@@ -163,6 +241,7 @@ public HealthRequestDescriptor()
 	public HealthRequestDescriptor WaitForNoRelocatingShards(bool? waitForNoRelocatingShards = true) => Qs("wait_for_no_relocating_shards", waitForNoRelocatingShards);
 	public HealthRequestDescriptor WaitForNodes(Union<string?, int?>? waitForNodes) => Qs("wait_for_nodes", waitForNodes);
 	public HealthRequestDescriptor WaitForStatus(Elastic.Clients.Elasticsearch.HealthStatus? waitForStatus) => Qs("wait_for_status", waitForStatus);
+
 	public HealthRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthResponse.g.cs
index ee5d0fef67b..303e5738c66 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Cluster/HealthResponse.g.cs
@@ -15,65 +15,110 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Cluster;
+
 public sealed partial class HealthResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>The number of active primary shards.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("active_primary_shards")]
 	public int ActivePrimaryShards { get; init; }
 
+	/// <summary>
+	/// <para>The total number of active primary and replica shards.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("active_shards")]
 	public int ActiveShards { get; init; }
 
+	/// <summary>
+	/// <para>The ratio of active shards in the cluster expressed as a percentage.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("active_shards_percent_as_number")]
 	public double ActiveShardsPercentAsNumber { get; init; }
 
+	/// <summary>
+	/// <para>The name of the cluster.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
 
+	/// <summary>
+	/// <para>The number of shards whose allocation has been delayed by the timeout settings.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("delayed_unassigned_shards")]
 	public int DelayedUnassignedShards { get; init; }
-
 	[JsonInclude, JsonPropertyName("indices")]
 	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Cluster.IndexHealthStats))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.Cluster.IndexHealthStats>? Indices { get; init; }
 
+	/// <summary>
+	/// <para>The number of shards that are under initialization.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("initializing_shards")]
 	public int InitializingShards { get; init; }
 
+	/// <summary>
+	/// <para>The number of nodes that are dedicated data nodes.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("number_of_data_nodes")]
 	public int NumberOfDataNodes { get; init; }
 
+	/// <summary>
+	/// <para>The number of unfinished fetches.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("number_of_in_flight_fetch")]
 	public int NumberOfInFlightFetch { get; init; }
 
+	/// <summary>
+	/// <para>The number of nodes within the cluster.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("number_of_nodes")]
 	public int NumberOfNodes { get; init; }
 
+	/// <summary>
+	/// <para>The number of cluster-level changes that have not yet been executed.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("number_of_pending_tasks")]
 	public int NumberOfPendingTasks { get; init; }
 
+	/// <summary>
+	/// <para>The number of shards that are under relocation.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("relocating_shards")]
 	public int RelocatingShards { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.HealthStatus Status { get; init; }
 
+	/// <summary>
+	/// <para>The time since the earliest initiated task is waiting for being performed.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("task_max_waiting_in_queue")]
 	public Elastic.Clients.Elasticsearch.Duration? TaskMaxWaitingInQueue { get; init; }
 
+	/// <summary>
+	/// <para>The time expressed in milliseconds since the earliest initiated task is waiting for being performed.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("task_max_waiting_in_queue_millis")]
 	public long TaskMaxWaitingInQueueMillis { get; init; }
 
+	/// <summary>
+	/// <para>If false the response returned within the period of time that is specified by the timeout parameter (30s by default)</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool TimedOut { get; init; }
 
+	/// <summary>
+	/// <para>The number of shards that are not allocated.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("unassigned_shards")]
 	public int UnassignedShards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountRequest.g.cs
index cc15c99c5f1..5bed5e66fd9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,53 +27,84 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class CountRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The analyzer to use for the query string</para>
+	/// </summary>
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether wildcard and prefix queries should be analyzed (default: false)</para>
+	/// </summary>
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The field to use as default where no field prefix is given in the query string</para>
+	/// </summary>
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete, expanded or aliased indices should be ignored when throttled</para>
+	/// </summary>
 	public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Include only documents with a specific `_score` value in the result</para>
+	/// </summary>
 	public double? MinScore { get => Q<double?>("min_score"); set => Q("min_score", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of specific routing values</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The maximum count for each shard, upon reaching which the query execution will terminate early</para>
+	/// </summary>
 	public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Query in the Lucene query string syntax</para>
+	/// </summary>
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 }
 
+/// <summary>
+/// <para>Returns number of documents matching a query.</para>
+/// </summary>
 public partial class CountRequest : PlainRequest<CountRequestParameters>
 {
 	public CountRequest()
@@ -82,58 +115,106 @@ public CountRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceCount;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceCount;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>The analyzer to use for the query string</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
+	/// <summary>
+	/// <para>Specify whether wildcard and prefix queries should be analyzed (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
+	/// <summary>
+	/// <para>The field to use as default where no field prefix is given in the query string</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete, expanded or aliased indices should be ignored when throttled</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
+	/// <summary>
+	/// <para>Include only documents with a specific `_score` value in the result</para>
+	/// </summary>
 	[JsonIgnore]
 	public double? MinScore { get => Q<double?>("min_score"); set => Q("min_score", value); }
 
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of specific routing values</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>The maximum count for each shard, upon reaching which the query execution will terminate early</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
 
+	/// <summary>
+	/// <para>Query in the Lucene query string syntax</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
 }
 
+/// <summary>
+/// <para>Returns number of documents matching a query.</para>
+/// </summary>
 public sealed partial class CountRequestDescriptor<TDocument> : RequestDescriptor<CountRequestDescriptor<TDocument>, CountRequestParameters>
 {
 	internal CountRequestDescriptor(Action<CountRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CountRequestDescriptor() : this(typeof(TDocument))
 	{
 	}
@@ -142,9 +223,12 @@ public CountRequestDescriptor(Elasticsearch.Indices? indices) : base(r => r.Opti
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceCount;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceCount;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public CountRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public CountRequestDescriptor<TDocument> AnalyzeWildcard(bool? analyzeWildcard = true) => Qs("analyze_wildcard", analyzeWildcard);
 	public CountRequestDescriptor<TDocument> Analyzer(string? analyzer) => Qs("analyzer", analyzer);
@@ -159,6 +243,7 @@ public CountRequestDescriptor(Elasticsearch.Indices? indices) : base(r => r.Opti
 	public CountRequestDescriptor<TDocument> QueryLuceneSyntax(string? q) => Qs("q", q);
 	public CountRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	public CountRequestDescriptor<TDocument> TerminateAfter(long? terminateAfter) => Qs("terminate_after", terminateAfter);
+
 	public CountRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -166,9 +251,7 @@ public CountRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.I
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
 
 	public CountRequestDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
@@ -218,9 +301,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns number of documents matching a query.</para>
+/// </summary>
 public sealed partial class CountRequestDescriptor : RequestDescriptor<CountRequestDescriptor, CountRequestParameters>
 {
 	internal CountRequestDescriptor(Action<CountRequestDescriptor> configure) => configure.Invoke(this);
+
 	public CountRequestDescriptor(Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices))
 	{
 	}
@@ -229,9 +316,12 @@ public CountRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceCount;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceCount;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public CountRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public CountRequestDescriptor AnalyzeWildcard(bool? analyzeWildcard = true) => Qs("analyze_wildcard", analyzeWildcard);
 	public CountRequestDescriptor Analyzer(string? analyzer) => Qs("analyzer", analyzer);
@@ -246,6 +336,7 @@ public CountRequestDescriptor()
 	public CountRequestDescriptor QueryLuceneSyntax(string? q) => Qs("q", q);
 	public CountRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	public CountRequestDescriptor TerminateAfter(long? terminateAfter) => Qs("terminate_after", terminateAfter);
+
 	public CountRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -253,9 +344,7 @@ public CountRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? ind
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> QueryDescriptorAction { get; set; }
 
 	public CountRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountResponse.g.cs
index 23ec7d778fc..50f94943241 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CountResponse.g.cs
@@ -15,19 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class CountResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateRequest.g.cs
index 9c564a288c5..a0af66bb9f0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,69 +27,116 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class CreateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The pipeline id to preprocess incoming documents with</para>
+	/// </summary>
 	public string? Pipeline { get => Q<string?>("pipeline"); set => Q("pipeline", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Refresh?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit version number for concurrency control</para>
+	/// </summary>
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific version type</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the index operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Creates a new document in the index.</para>
+/// <para>Returns a 409 response when a document with a same ID already exists in the index.</para>
+/// </summary>
 public sealed partial class CreateRequest<TDocument> : PlainRequest<CreateRequestParameters>
 {
 	public CreateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceCreate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceCreate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	[JsonIgnore]
 	public TDocument Document { get; set; }
 
+	/// <summary>
+	/// <para>The pipeline id to preprocess incoming documents with</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Pipeline { get => Q<string?>("pipeline"); set => Q("pipeline", value); }
 
+	/// <summary>
+	/// <para>If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Refresh?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit version number for concurrency control</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
+	/// <summary>
+	/// <para>Specific version type</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the index operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Creates a new document in the index.</para>
+/// <para>Returns a 409 response when a document with a same ID already exists in the index.</para>
+/// </summary>
 public sealed partial class CreateRequestDescriptor<TDocument> : RequestDescriptor<CreateRequestDescriptor<TDocument>, CreateRequestParameters>
 {
 	internal CreateRequestDescriptor(Action<CreateRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal CreateRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -96,6 +145,7 @@ internal CreateRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index,
 	public CreateRequestDescriptor(TDocument document, IndexName index, Id id) : this(index, id) => DocumentValue = document;
 	public CreateRequestDescriptor(TDocument document, IndexName index) : this(index, Elasticsearch.Id.From(document)) => DocumentValue = document;
 	public CreateRequestDescriptor(TDocument document, Id id) : this(typeof(TDocument), id) => DocumentValue = document;
+
 	public CreateRequestDescriptor(Id id) : this(typeof(TDocument), id)
 	{
 	}
@@ -104,9 +154,12 @@ internal CreateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceCreate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceCreate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	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);
@@ -114,6 +167,7 @@ internal CreateRequestDescriptor()
 	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);
+
 	public CreateRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateResponse.g.cs
index a7fbef41544..8b479f3e8ed 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/CreateResponse.g.cs
@@ -15,37 +15,32 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class CreateResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("forced_refresh")]
 	public bool? ForcedRefresh { get; init; }
-
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("_primary_term")]
 	public long PrimaryTerm { get; init; }
-
 	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Result Result { get; init; }
-
 	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long SeqNo { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("_version")]
 	public long Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs
index cb9215b4f25..c57697c2e79 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,201 +27,348 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class DeleteByQueryRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The analyzer to use for the query string</para>
+	/// </summary>
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether wildcard and prefix queries should be analyzed (default: false)</para>
+	/// </summary>
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>What to do when the delete by query hits version conflicts?</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Conflicts? Conflicts { get => Q<Elastic.Clients.Elasticsearch.Conflicts?>("conflicts"); set => Q("conflicts", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The field to use as default where no field prefix is given in the query string</para>
+	/// </summary>
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Starting offset (default: 0)</para>
+	/// </summary>
 	public long? From { get => Q<long?>("from"); set => Q("from", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Should the affected indexes be refreshed?</para>
+	/// </summary>
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify if request cache should be used for this request or not, defaults to index level setting</para>
+	/// </summary>
 	public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The throttle for this request in sub-requests per second. -1 means no throttle.</para>
+	/// </summary>
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of specific routing values</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Query in the Lucene query string syntax</para>
+	/// </summary>
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify how long a consistent view of the index should be maintained for scrolled search</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Size on the scroll request powering the delete by query</para>
+	/// </summary>
 	public long? ScrollSize { get => Q<long?>("scroll_size"); set => Q("scroll_size", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit timeout for each search request. Defaults to no timeout.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("search_timeout"); set => Q("search_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The number of slices this task should be divided into. Defaults to 1, meaning the task isn't sliced into subtasks. Can be set to `auto`.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Slices? Slices { get => Q<Elastic.Clients.Elasticsearch.Slices?>("slices"); set => Q("slices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of <field>:<direction> pairs</para>
+	/// </summary>
 	public ICollection<string>? Sort { get => Q<ICollection<string>?>("sort"); set => Q("sort", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific 'tag' of the request for logging and statistical purposes</para>
+	/// </summary>
 	public ICollection<string>? Stats { get => Q<ICollection<string>?>("stats"); set => Q("stats", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The maximum number of documents to collect for each shard, upon reaching which the query execution will terminate early.</para>
+	/// </summary>
 	public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Time each individual bulk request should wait for shards that are unavailable.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether to return document version as part of a hit</para>
+	/// </summary>
 	public bool? Version { get => Q<bool?>("version"); set => Q("version", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the delete by query operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Should the request should block until the delete by query is complete.</para>
+	/// </summary>
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
 }
 
+/// <summary>
+/// <para>Deletes documents matching the provided query.</para>
+/// </summary>
 public sealed partial class DeleteByQueryRequest : PlainRequest<DeleteByQueryRequestParameters>
 {
 	public DeleteByQueryRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDeleteByQuery;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceDeleteByQuery;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>The analyzer to use for the query string</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
+	/// <summary>
+	/// <para>Specify whether wildcard and prefix queries should be analyzed (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
+	/// <summary>
+	/// <para>What to do when the delete by query hits version conflicts?</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Conflicts? Conflicts { get => Q<Elastic.Clients.Elasticsearch.Conflicts?>("conflicts"); set => Q("conflicts", value); }
 
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
+	/// <summary>
+	/// <para>The field to use as default where no field prefix is given in the query string</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Starting offset (default: 0)</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? From { get => Q<long?>("from"); set => Q("from", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>Should the affected indexes be refreshed?</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>Specify if request cache should be used for this request or not, defaults to index level setting</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
+	/// <summary>
+	/// <para>The throttle for this request in sub-requests per second. -1 means no throttle.</para>
+	/// </summary>
 	[JsonIgnore]
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of specific routing values</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>Query in the Lucene query string syntax</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 
+	/// <summary>
+	/// <para>Specify how long a consistent view of the index should be maintained for scrolled search</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
+	/// <summary>
+	/// <para>Size on the scroll request powering the delete by query</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? ScrollSize { get => Q<long?>("scroll_size"); set => Q("scroll_size", value); }
 
+	/// <summary>
+	/// <para>Explicit timeout for each search request. Defaults to no timeout.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("search_timeout"); set => Q("search_timeout", value); }
 
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
+	/// <summary>
+	/// <para>The number of slices this task should be divided into. Defaults to 1, meaning the task isn't sliced into subtasks. Can be set to `auto`.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Slices? Slices { get => Q<Elastic.Clients.Elasticsearch.Slices?>("slices"); set => Q("slices", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of <field>:<direction> pairs</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<string>? Sort { get => Q<ICollection<string>?>("sort"); set => Q("sort", value); }
 
+	/// <summary>
+	/// <para>Specific 'tag' of the request for logging and statistical purposes</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<string>? Stats { get => Q<ICollection<string>?>("stats"); set => Q("stats", value); }
 
+	/// <summary>
+	/// <para>The maximum number of documents to collect for each shard, upon reaching which the query execution will terminate early.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
 
+	/// <summary>
+	/// <para>Time each individual bulk request should wait for shards that are unavailable.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Specify whether to return document version as part of a hit</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Version { get => Q<bool?>("version"); set => Q("version", value); }
 
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the delete by query operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
+	/// <summary>
+	/// <para>Should the request should block until the delete by query is complete.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
-
 	[JsonInclude, JsonPropertyName("max_docs")]
 	public long? MaxDocs { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("slice")]
 	public Elastic.Clients.Elasticsearch.SlicedScroll? Slice { get; set; }
 }
 
+/// <summary>
+/// <para>Deletes documents matching the provided query.</para>
+/// </summary>
 public sealed partial class DeleteByQueryRequestDescriptor<TDocument> : RequestDescriptor<DeleteByQueryRequestDescriptor<TDocument>, DeleteByQueryRequestParameters>
 {
 	internal DeleteByQueryRequestDescriptor(Action<DeleteByQueryRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DeleteByQueryRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -228,9 +377,12 @@ internal DeleteByQueryRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDeleteByQuery;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceDeleteByQuery;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public DeleteByQueryRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public DeleteByQueryRequestDescriptor<TDocument> AnalyzeWildcard(bool? analyzeWildcard = true) => Qs("analyze_wildcard", analyzeWildcard);
 	public DeleteByQueryRequestDescriptor<TDocument> Analyzer(string? analyzer) => Qs("analyzer", analyzer);
@@ -259,6 +411,7 @@ internal DeleteByQueryRequestDescriptor()
 	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);
+
 	public DeleteByQueryRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -266,17 +419,11 @@ public DeleteByQueryRequestDescriptor<TDocument> Indices(Elastic.Clients.Elastic
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; }
-
 	private SlicedScrollDescriptor<TDocument> SliceDescriptor { get; set; }
-
 	private Action<SlicedScrollDescriptor<TDocument>> SliceDescriptorAction { get; set; }
-
 	private long? MaxDocsValue { get; set; }
 
 	public DeleteByQueryRequestDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
@@ -378,9 +525,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Deletes documents matching the provided query.</para>
+/// </summary>
 public sealed partial class DeleteByQueryRequestDescriptor : RequestDescriptor<DeleteByQueryRequestDescriptor, DeleteByQueryRequestParameters>
 {
 	internal DeleteByQueryRequestDescriptor(Action<DeleteByQueryRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeleteByQueryRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -389,9 +540,12 @@ internal DeleteByQueryRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDeleteByQuery;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceDeleteByQuery;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public DeleteByQueryRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public DeleteByQueryRequestDescriptor AnalyzeWildcard(bool? analyzeWildcard = true) => Qs("analyze_wildcard", analyzeWildcard);
 	public DeleteByQueryRequestDescriptor Analyzer(string? analyzer) => Qs("analyzer", analyzer);
@@ -420,6 +574,7 @@ internal DeleteByQueryRequestDescriptor()
 	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);
+
 	public DeleteByQueryRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -427,17 +582,11 @@ public DeleteByQueryRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indi
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; }
-
 	private SlicedScrollDescriptor SliceDescriptor { get; set; }
-
 	private Action<SlicedScrollDescriptor> SliceDescriptorAction { get; set; }
-
 	private long? MaxDocsValue { get; set; }
 
 	public DeleteByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs
index dd72a985961..15b81f26254 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryResponse.g.cs
@@ -15,61 +15,48 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class DeleteByQueryResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("batches")]
 	public long? Batches { get; init; }
-
 	[JsonInclude, JsonPropertyName("deleted")]
 	public long? Deleted { get; init; }
-
 	[JsonInclude, JsonPropertyName("failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.BulkIndexByScrollFailure>? Failures { get; init; }
-
 	[JsonInclude, JsonPropertyName("noops")]
 	public long? Noops { get; init; }
-
 	[JsonInclude, JsonPropertyName("requests_per_second")]
 	public float? RequestsPerSecond { get; init; }
-
 	[JsonInclude, JsonPropertyName("retries")]
 	public Elastic.Clients.Elasticsearch.Retries? Retries { get; init; }
-
 	[JsonInclude, JsonPropertyName("slice_id")]
 	public int? SliceId { get; init; }
-
 	[JsonInclude, 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; }
-
 	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool? TimedOut { get; init; }
-
 	[JsonInclude, JsonPropertyName("took")]
 	public long? Took { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public long? Total { get; init; }
-
 	[JsonInclude, JsonPropertyName("version_conflicts")]
 	public long? VersionConflicts { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleRequest.g.cs
index 480dd4898d1..7a767ff177d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,30 +27,45 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class DeleteByQueryRethrottleRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The throttle to set on this request in floating sub-requests per second. -1 means set no throttle.</para>
+	/// </summary>
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 }
 
+/// <summary>
+/// <para>Changes the number of requests per second for a particular Delete By Query operation.</para>
+/// </summary>
 public sealed partial class DeleteByQueryRethrottleRequest : PlainRequest<DeleteByQueryRethrottleRequestParameters>
 {
 	public DeleteByQueryRethrottleRequest(Elastic.Clients.Elasticsearch.TaskId task_id) : base(r => r.Required("task_id", task_id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDeleteByQueryRethrottle;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceDeleteByQueryRethrottle;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>The throttle to set on this request in floating sub-requests per second. -1 means set no throttle.</para>
+	/// </summary>
 	[JsonIgnore]
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 }
 
+/// <summary>
+/// <para>Changes the number of requests per second for a particular Delete By Query operation.</para>
+/// </summary>
 public sealed partial class DeleteByQueryRethrottleRequestDescriptor : RequestDescriptor<DeleteByQueryRethrottleRequestDescriptor, DeleteByQueryRethrottleRequestParameters>
 {
 	internal DeleteByQueryRethrottleRequestDescriptor(Action<DeleteByQueryRethrottleRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeleteByQueryRethrottleRequestDescriptor(Elastic.Clients.Elasticsearch.TaskId task_id) : base(r => r.Required("task_id", task_id))
 	{
 	}
@@ -57,10 +74,14 @@ internal DeleteByQueryRethrottleRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDeleteByQueryRethrottle;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceDeleteByQueryRethrottle;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public DeleteByQueryRethrottleRequestDescriptor RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
+
 	public DeleteByQueryRethrottleRequestDescriptor TaskId(Elastic.Clients.Elasticsearch.TaskId task_id)
 	{
 		RouteValues.Required("task_id", task_id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleResponse.g.cs
index 1c65f18db98..0e89b7aac72 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteByQueryRethrottleResponse.g.cs
@@ -15,25 +15,32 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class DeleteByQueryRethrottleResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("node_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>? NodeFailures { get; init; }
 
+	/// <summary>
+	/// <para>Task information grouped by node, if `group_by` was set to `node` (the default).</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Tasks.NodeTasks>? Nodes { get; init; }
-
 	[JsonInclude, JsonPropertyName("task_failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.TaskFailure>? TaskFailures { get; init; }
 
+	/// <summary>
+	/// <para>Either a flat list of tasks if `group_by` was set to `none`, or grouped by parents if<br/>`group_by` was set to `parents`.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tasks")]
 	public Elastic.Clients.Elasticsearch.Tasks.TaskInfos? Tasks { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteRequest.g.cs
index ffd5b819e72..207f851e361 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,72 +27,122 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class DeleteRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>only perform the delete operation if the last operation that has changed the document has the specified primary term</para>
+	/// </summary>
 	public long? IfPrimaryTerm { get => Q<long?>("if_primary_term"); set => Q("if_primary_term", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>only perform the delete operation if the last operation that has changed the document has the specified sequence number</para>
+	/// </summary>
 	public long? IfSeqNo { get => Q<long?>("if_seq_no"); set => Q("if_seq_no", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Refresh?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit version number for concurrency control</para>
+	/// </summary>
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific version type</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the delete operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Removes a document from the index.</para>
+/// </summary>
 public partial class DeleteRequest : PlainRequest<DeleteRequestParameters>
 {
 	public DeleteRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>only perform the delete operation if the last operation that has changed the document has the specified primary term</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? IfPrimaryTerm { get => Q<long?>("if_primary_term"); set => Q("if_primary_term", value); }
 
+	/// <summary>
+	/// <para>only perform the delete operation if the last operation that has changed the document has the specified sequence number</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? IfSeqNo { get => Q<long?>("if_seq_no"); set => Q("if_seq_no", value); }
 
+	/// <summary>
+	/// <para>If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Refresh?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit version number for concurrency control</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
+	/// <summary>
+	/// <para>Specific version type</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the delete operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Removes a document from the index.</para>
+/// </summary>
 public sealed partial class DeleteRequestDescriptor<TDocument> : RequestDescriptor<DeleteRequestDescriptor<TDocument>, DeleteRequestParameters>
 {
 	internal DeleteRequestDescriptor(Action<DeleteRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DeleteRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -119,9 +171,12 @@ internal DeleteRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public DeleteRequestDescriptor<TDocument> IfPrimaryTerm(long? ifPrimaryTerm) => Qs("if_primary_term", ifPrimaryTerm);
 	public DeleteRequestDescriptor<TDocument> IfSeqNo(long? ifSeqNo) => Qs("if_seq_no", ifSeqNo);
 	public DeleteRequestDescriptor<TDocument> Refresh(Elastic.Clients.Elasticsearch.Refresh? refresh) => Qs("refresh", refresh);
@@ -130,6 +185,7 @@ internal DeleteRequestDescriptor()
 	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);
+
 	public DeleteRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -147,9 +203,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Removes a document from the index.</para>
+/// </summary>
 public sealed partial class DeleteRequestDescriptor : RequestDescriptor<DeleteRequestDescriptor, DeleteRequestParameters>
 {
 	internal DeleteRequestDescriptor(Action<DeleteRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeleteRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -158,9 +218,12 @@ internal DeleteRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public DeleteRequestDescriptor IfPrimaryTerm(long? ifPrimaryTerm) => Qs("if_primary_term", ifPrimaryTerm);
 	public DeleteRequestDescriptor IfSeqNo(long? ifSeqNo) => Qs("if_seq_no", ifSeqNo);
 	public DeleteRequestDescriptor Refresh(Elastic.Clients.Elasticsearch.Refresh? refresh) => Qs("refresh", refresh);
@@ -169,6 +232,7 @@ internal DeleteRequestDescriptor()
 	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);
+
 	public DeleteRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteResponse.g.cs
index af7fbb07974..f127c382bfd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteResponse.g.cs
@@ -15,37 +15,32 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class DeleteResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("forced_refresh")]
 	public bool? ForcedRefresh { get; init; }
-
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("_primary_term")]
 	public long PrimaryTerm { get; init; }
-
 	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Result Result { get; init; }
-
 	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long SeqNo { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("_version")]
 	public long Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptRequest.g.cs
index dc60f699a74..60d8631c59b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,36 +27,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class DeleteScriptRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Deletes a script.</para>
+/// </summary>
 public sealed partial class DeleteScriptRequest : PlainRequest<DeleteScriptRequestParameters>
 {
 	public DeleteScriptRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDeleteScript;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceDeleteScript;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Deletes a script.</para>
+/// </summary>
 public sealed partial class DeleteScriptRequestDescriptor<TDocument> : RequestDescriptor<DeleteScriptRequestDescriptor<TDocument>, DeleteScriptRequestParameters>
 {
 	internal DeleteScriptRequestDescriptor(Action<DeleteScriptRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DeleteScriptRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -63,11 +85,15 @@ internal DeleteScriptRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDeleteScript;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceDeleteScript;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	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);
@@ -79,9 +105,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Deletes a script.</para>
+/// </summary>
 public sealed partial class DeleteScriptRequestDescriptor : RequestDescriptor<DeleteScriptRequestDescriptor, DeleteScriptRequestParameters>
 {
 	internal DeleteScriptRequestDescriptor(Action<DeleteScriptRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeleteScriptRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -90,11 +120,15 @@ internal DeleteScriptRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceDeleteScript;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceDeleteScript;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	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/DeleteScriptResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptResponse.g.cs
index 147c93f45c4..bdc33329986 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/DeleteScriptResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class DeleteScriptResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteRequest.g.cs
index 9dff6d0d0d7..f49c8990354 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,26 +27,35 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public sealed class EqlDeleteRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Deletes an async EQL search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted.</para>
+/// </summary>
 public sealed partial class EqlDeleteRequest : PlainRequest<EqlDeleteRequestParameters>
 {
 	public EqlDeleteRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Deletes an async EQL search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted.</para>
+/// </summary>
 public sealed partial class EqlDeleteRequestDescriptor<TDocument> : RequestDescriptor<EqlDeleteRequestDescriptor<TDocument>, EqlDeleteRequestParameters>
 {
 	internal EqlDeleteRequestDescriptor(Action<EqlDeleteRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public EqlDeleteRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -53,9 +64,12 @@ internal EqlDeleteRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public EqlDeleteRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -67,9 +81,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Deletes an async EQL search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted.</para>
+/// </summary>
 public sealed partial class EqlDeleteRequestDescriptor : RequestDescriptor<EqlDeleteRequestDescriptor, EqlDeleteRequestParameters>
 {
 	internal EqlDeleteRequestDescriptor(Action<EqlDeleteRequestDescriptor> configure) => configure.Invoke(this);
+
 	public EqlDeleteRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -78,9 +96,12 @@ internal EqlDeleteRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public EqlDeleteRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteResponse.g.cs
index b4fee126bae..9ec35f18490 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlDeleteResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public sealed partial class EqlDeleteResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetRequest.g.cs
index bdc28da0444..e255a6d5be6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,36 +27,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public sealed class EqlGetRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period for which the search and its results are stored on the cluster. Defaults to the keep_alive value set by the search’s EQL search API request.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Timeout duration to wait for the request to finish. Defaults to no timeout, meaning the request waits for complete search results.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns async results from previously executed Event Query Language (EQL) search</para>
+/// </summary>
 public sealed partial class EqlGetRequest : PlainRequest<EqlGetRequestParameters>
 {
 	public EqlGetRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Period for which the search and its results are stored on the cluster. Defaults to the keep_alive value set by the search’s EQL search API request.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
+	/// <summary>
+	/// <para>Timeout duration to wait for the request to finish. Defaults to no timeout, meaning the request waits for complete search results.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns async results from previously executed Event Query Language (EQL) search</para>
+/// </summary>
 public sealed partial class EqlGetRequestDescriptor<TDocument> : RequestDescriptor<EqlGetRequestDescriptor<TDocument>, EqlGetRequestParameters>
 {
 	internal EqlGetRequestDescriptor(Action<EqlGetRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public EqlGetRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -63,11 +85,15 @@ internal EqlGetRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public EqlGetRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
 	public EqlGetRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+
 	public EqlGetRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -79,9 +105,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns async results from previously executed Event Query Language (EQL) search</para>
+/// </summary>
 public sealed partial class EqlGetRequestDescriptor : RequestDescriptor<EqlGetRequestDescriptor, EqlGetRequestParameters>
 {
 	internal EqlGetRequestDescriptor(Action<EqlGetRequestDescriptor> configure) => configure.Invoke(this);
+
 	public EqlGetRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -90,11 +120,15 @@ internal EqlGetRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public EqlGetRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
 	public EqlGetRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+
 	public EqlGetRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetResponse.g.cs
index a526f539446..bc4abc18da0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlGetResponse.g.cs
@@ -15,31 +15,51 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public sealed partial class EqlGetResponse<TEvent> : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>Contains matching events and sequences. Also contains related metadata.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Eql.EqlHits<TEvent> Hits { get; init; }
 
+	/// <summary>
+	/// <para>Identifier for the search.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
 
+	/// <summary>
+	/// <para>If true, the response does not contain complete search results.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool? IsPartial { get; init; }
 
+	/// <summary>
+	/// <para>If true, the search request is still executing.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_running")]
 	public bool? IsRunning { get; init; }
 
+	/// <summary>
+	/// <para>If true, the request timed out before completion.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool? TimedOut { get; init; }
 
+	/// <summary>
+	/// <para>Milliseconds it took Elasticsearch to execute the request.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("took")]
 	public long? Took { 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 cec3edbef66..e36776b0a53 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,84 +27,113 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public sealed class EqlSearchRequestParameters : RequestParameters
 {
-	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
-
-	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, missing or closed indices are not included in the response.</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 }
 
+/// <summary>
+/// <para>Returns results matching a query expressed in Event Query Language (EQL)</para>
+/// </summary>
 public sealed partial class EqlSearchRequest : PlainRequest<EqlSearchRequestParameters>
 {
 	public EqlSearchRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlSearch;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlSearch;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
-
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>If true, missing or closed indices are not included in the response.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>EQL query you wish to run.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("case_sensitive")]
 	public bool? CaseSensitive { get; set; }
 
+	/// <summary>
+	/// <para>Field containing the event classification, such as process, file, or network.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("event_category_field")]
 	public Elastic.Clients.Elasticsearch.Field? EventCategoryField { get; set; }
 
+	/// <summary>
+	/// <para>Field used to sort hits with the same timestamp in ascending order</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tiebreaker_field")]
 	public Elastic.Clients.Elasticsearch.Field? TiebreakerField { get; set; }
 
+	/// <summary>
+	/// <para>Field containing event timestamp. Default "@timestamp"</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("timestamp_field")]
 	public Elastic.Clients.Elasticsearch.Field? TimestampField { get; set; }
 
+	/// <summary>
+	/// <para>Maximum number of events to search at a time for sequence queries.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("fetch_size")]
 	public int? FetchSize { get; set; }
 
+	/// <summary>
+	/// <para>Query, written in Query DSL, used to filter the events on which the EQL query runs.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("filter"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("keep_alive")]
 	public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get; set; }
-
 	[JsonInclude, JsonPropertyName("keep_on_completion")]
 	public bool? KeepOnCompletion { get; set; }
-
 	[JsonInclude, JsonPropertyName("wait_for_completion_timeout")]
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get; set; }
 
+	/// <summary>
+	/// <para>For basic queries, the maximum number of matching events to return. Defaults to 10</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The response returns values for field names matching these patterns in the fields property of each hit.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("fields"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("result_position")]
 	public Elastic.Clients.Elasticsearch.Eql.ResultPosition? ResultPosition { get; set; }
-
 	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 }
 
+/// <summary>
+/// <para>Returns results matching a query expressed in Event Query Language (EQL)</para>
+/// </summary>
 public sealed partial class EqlSearchRequestDescriptor<TDocument> : RequestDescriptor<EqlSearchRequestDescriptor<TDocument>, EqlSearchRequestParameters>
 {
 	internal EqlSearchRequestDescriptor(Action<EqlSearchRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public EqlSearchRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -111,12 +142,16 @@ internal EqlSearchRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlSearch;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlSearch;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public EqlSearchRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public EqlSearchRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public EqlSearchRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
+
 	public EqlSearchRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -124,45 +159,29 @@ public EqlSearchRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsear
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? FieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor<TDocument> FieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>> FieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>>[] FieldsDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>>[] FilterDescriptorActions { get; set; }
-
 	private bool? CaseSensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? EventCategoryFieldValue { get; set; }
-
 	private int? FetchSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? KeepAliveValue { get; set; }
-
 	private bool? KeepOnCompletionValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Eql.ResultPosition? ResultPositionValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TiebreakerFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TimestampFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeoutValue { get; set; }
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The response returns values for field names matching these patterns in the fields property of each hit.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor<TDocument> Fields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? fields)
 	{
 		FieldsDescriptor = null;
@@ -199,6 +218,9 @@ public EqlSearchRequestDescriptor<TDocument> Fields(params Action<QueryDsl.Field
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Query, written in Query DSL, used to filter the events on which the EQL query runs.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor<TDocument> Filter(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? filter)
 	{
 		FilterDescriptor = null;
@@ -241,18 +263,27 @@ public EqlSearchRequestDescriptor<TDocument> CaseSensitive(bool? caseSensitive =
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field containing the event classification, such as process, file, or network.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor<TDocument> EventCategoryField(Elastic.Clients.Elasticsearch.Field? eventCategoryField)
 	{
 		EventCategoryFieldValue = eventCategoryField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field containing the event classification, such as process, file, or network.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor<TDocument> EventCategoryField<TValue>(Expression<Func<TDocument, TValue>> eventCategoryField)
 	{
 		EventCategoryFieldValue = eventCategoryField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Maximum number of events to search at a time for sequence queries.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor<TDocument> FetchSize(int? fetchSize)
 	{
 		FetchSizeValue = fetchSize;
@@ -271,6 +302,9 @@ public EqlSearchRequestDescriptor<TDocument> KeepOnCompletion(bool? keepOnComple
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>EQL query you wish to run.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor<TDocument> Query(string query)
 	{
 		QueryValue = query;
@@ -289,30 +323,45 @@ public EqlSearchRequestDescriptor<TDocument> RuntimeMappings(Func<FluentDictiona
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>For basic queries, the maximum number of matching events to return. Defaults to 10</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor<TDocument> Size(int? size)
 	{
 		SizeValue = size;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field used to sort hits with the same timestamp in ascending order</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor<TDocument> TiebreakerField(Elastic.Clients.Elasticsearch.Field? tiebreakerField)
 	{
 		TiebreakerFieldValue = tiebreakerField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field used to sort hits with the same timestamp in ascending order</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor<TDocument> TiebreakerField<TValue>(Expression<Func<TDocument, TValue>> tiebreakerField)
 	{
 		TiebreakerFieldValue = tiebreakerField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field containing event timestamp. Default "@timestamp"</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor<TDocument> TimestampField(Elastic.Clients.Elasticsearch.Field? timestampField)
 	{
 		TimestampFieldValue = timestampField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field containing event timestamp. Default "@timestamp"</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor<TDocument> TimestampField<TValue>(Expression<Func<TDocument, TValue>> timestampField)
 	{
 		TimestampFieldValue = timestampField;
@@ -458,9 +507,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns results matching a query expressed in Event Query Language (EQL)</para>
+/// </summary>
 public sealed partial class EqlSearchRequestDescriptor : RequestDescriptor<EqlSearchRequestDescriptor, EqlSearchRequestParameters>
 {
 	internal EqlSearchRequestDescriptor(Action<EqlSearchRequestDescriptor> configure) => configure.Invoke(this);
+
 	public EqlSearchRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -469,12 +522,16 @@ internal EqlSearchRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlSearch;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlSearch;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public EqlSearchRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public EqlSearchRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public EqlSearchRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
+
 	public EqlSearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -482,45 +539,29 @@ public EqlSearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? FieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor FieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor> FieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor>[] FieldsDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor>[] FilterDescriptorActions { get; set; }
-
 	private bool? CaseSensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? EventCategoryFieldValue { get; set; }
-
 	private int? FetchSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? KeepAliveValue { get; set; }
-
 	private bool? KeepOnCompletionValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Eql.ResultPosition? ResultPositionValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TiebreakerFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TimestampFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeoutValue { get; set; }
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The response returns values for field names matching these patterns in the fields property of each hit.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor Fields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? fields)
 	{
 		FieldsDescriptor = null;
@@ -557,6 +598,9 @@ public EqlSearchRequestDescriptor Fields(params Action<QueryDsl.FieldAndFormatDe
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Query, written in Query DSL, used to filter the events on which the EQL query runs.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor Filter(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? filter)
 	{
 		FilterDescriptor = null;
@@ -599,24 +643,36 @@ public EqlSearchRequestDescriptor CaseSensitive(bool? caseSensitive = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field containing the event classification, such as process, file, or network.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor EventCategoryField(Elastic.Clients.Elasticsearch.Field? eventCategoryField)
 	{
 		EventCategoryFieldValue = eventCategoryField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field containing the event classification, such as process, file, or network.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor EventCategoryField<TDocument, TValue>(Expression<Func<TDocument, TValue>> eventCategoryField)
 	{
 		EventCategoryFieldValue = eventCategoryField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field containing the event classification, such as process, file, or network.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor EventCategoryField<TDocument>(Expression<Func<TDocument, object>> eventCategoryField)
 	{
 		EventCategoryFieldValue = eventCategoryField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Maximum number of events to search at a time for sequence queries.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor FetchSize(int? fetchSize)
 	{
 		FetchSizeValue = fetchSize;
@@ -635,6 +691,9 @@ public EqlSearchRequestDescriptor KeepOnCompletion(bool? keepOnCompletion = true
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>EQL query you wish to run.</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor Query(string query)
 	{
 		QueryValue = query;
@@ -653,42 +712,63 @@ public EqlSearchRequestDescriptor RuntimeMappings(Func<FluentDictionary<Elastic.
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>For basic queries, the maximum number of matching events to return. Defaults to 10</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor Size(int? size)
 	{
 		SizeValue = size;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field used to sort hits with the same timestamp in ascending order</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor TiebreakerField(Elastic.Clients.Elasticsearch.Field? tiebreakerField)
 	{
 		TiebreakerFieldValue = tiebreakerField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field used to sort hits with the same timestamp in ascending order</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor TiebreakerField<TDocument, TValue>(Expression<Func<TDocument, TValue>> tiebreakerField)
 	{
 		TiebreakerFieldValue = tiebreakerField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field used to sort hits with the same timestamp in ascending order</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor TiebreakerField<TDocument>(Expression<Func<TDocument, object>> tiebreakerField)
 	{
 		TiebreakerFieldValue = tiebreakerField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field containing event timestamp. Default "@timestamp"</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor TimestampField(Elastic.Clients.Elasticsearch.Field? timestampField)
 	{
 		TimestampFieldValue = timestampField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field containing event timestamp. Default "@timestamp"</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor TimestampField<TDocument, TValue>(Expression<Func<TDocument, TValue>> timestampField)
 	{
 		TimestampFieldValue = timestampField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Field containing event timestamp. Default "@timestamp"</para>
+	/// </summary>
 	public EqlSearchRequestDescriptor TimestampField<TDocument>(Expression<Func<TDocument, object>> timestampField)
 	{
 		TimestampFieldValue = timestampField;
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 c4657272f7d..e8a1e8c1416 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchResponse.g.cs
@@ -15,31 +15,51 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public sealed partial class EqlSearchResponse<TEvent> : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>Contains matching events and sequences. Also contains related metadata.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Eql.EqlHits<TEvent> Hits { get; init; }
 
+	/// <summary>
+	/// <para>Identifier for the search.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
 
+	/// <summary>
+	/// <para>If true, the response does not contain complete search results.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool? IsPartial { get; init; }
 
+	/// <summary>
+	/// <para>If true, the search request is still executing.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_running")]
 	public bool? IsRunning { get; init; }
 
+	/// <summary>
+	/// <para>If true, the request timed out before completion.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool? TimedOut { get; init; }
 
+	/// <summary>
+	/// <para>Milliseconds it took Elasticsearch to execute the request.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("took")]
 	public long? Took { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusRequest.g.cs
index 85a0c5a0a58..b88a3a8b593 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,26 +27,35 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public sealed class GetEqlStatusRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Returns the status of a previously submitted async or stored Event Query Language (EQL) search</para>
+/// </summary>
 public sealed partial class GetEqlStatusRequest : PlainRequest<GetEqlStatusRequestParameters>
 {
 	public GetEqlStatusRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGetStatus;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlGetStatus;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Returns the status of a previously submitted async or stored Event Query Language (EQL) search</para>
+/// </summary>
 public sealed partial class GetEqlStatusRequestDescriptor<TDocument> : RequestDescriptor<GetEqlStatusRequestDescriptor<TDocument>, GetEqlStatusRequestParameters>
 {
 	internal GetEqlStatusRequestDescriptor(Action<GetEqlStatusRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetEqlStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -53,9 +64,12 @@ internal GetEqlStatusRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGetStatus;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlGetStatus;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetEqlStatusRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -67,9 +81,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns the status of a previously submitted async or stored Event Query Language (EQL) search</para>
+/// </summary>
 public sealed partial class GetEqlStatusRequestDescriptor : RequestDescriptor<GetEqlStatusRequestDescriptor, GetEqlStatusRequestParameters>
 {
 	internal GetEqlStatusRequestDescriptor(Action<GetEqlStatusRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetEqlStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -78,9 +96,12 @@ internal GetEqlStatusRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.EqlGetStatus;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.EqlGetStatus;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetEqlStatusRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusResponse.g.cs
index 63288c3ca8b..bdd96f4fcfb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/GetEqlStatusResponse.g.cs
@@ -15,31 +15,51 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public sealed partial class GetEqlStatusResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a completed search shows the http status code of the completed search.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("completion_status")]
 	public int? CompletionStatus { get; init; }
 
+	/// <summary>
+	/// <para>Shows a timestamp when the eql search will be expired, in milliseconds since the Unix epoch. When this time is reached, the search and its results are deleted, even if the search is still ongoing.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("expiration_time_in_millis")]
 	public long? ExpirationTimeInMillis { get; init; }
 
+	/// <summary>
+	/// <para>Identifier for the search.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
+	/// <summary>
+	/// <para>If true, the search request is still executing. If false, the search is completed.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
+	/// <summary>
+	/// <para>If true, the response does not contain complete search results. This could be because either the search is still running (is_running status is false), or because it is already completed (is_running status is true) and results are partial due to failures or timeouts.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
 
+	/// <summary>
+	/// <para>For a running search shows a timestamp when the eql search started, in milliseconds since the Unix epoch.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("start_time_in_millis")]
 	public long? StartTimeInMillis { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsRequest.g.cs
index d4abfe26cdd..3dba165a313 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,84 +27,144 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class ExistsRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether to perform the operation in realtime or search mode</para>
+	/// </summary>
 	public bool? Realtime { get => Q<bool?>("realtime"); set => Q("realtime", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Refresh the shard containing the document before performing the operation</para>
+	/// </summary>
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or a list of fields to return</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A list of fields to exclude from the returned _source field</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A list of fields to extract and return from the _source field</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of stored fields to return in the response</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("stored_fields"); set => Q("stored_fields", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit version number for concurrency control</para>
+	/// </summary>
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific version type</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a document exists in an index.</para>
+/// </summary>
 public sealed partial class ExistsRequest : PlainRequest<ExistsRequestParameters>
 {
 	public ExistsRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceExists;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceExists;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>Specify whether to perform the operation in realtime or search mode</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Realtime { get => Q<bool?>("realtime"); set => Q("realtime", value); }
 
+	/// <summary>
+	/// <para>Refresh the shard containing the document before performing the operation</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or a list of fields to return</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
+	/// <summary>
+	/// <para>A list of fields to exclude from the returned _source field</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
+	/// <summary>
+	/// <para>A list of fields to extract and return from the _source field</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of stored fields to return in the response</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("stored_fields"); set => Q("stored_fields", value); }
 
+	/// <summary>
+	/// <para>Explicit version number for concurrency control</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
+	/// <summary>
+	/// <para>Specific version type</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a document exists in an index.</para>
+/// </summary>
 public sealed partial class ExistsRequestDescriptor<TDocument> : RequestDescriptor<ExistsRequestDescriptor<TDocument>, ExistsRequestParameters>
 {
 	internal ExistsRequestDescriptor(Action<ExistsRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ExistsRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -131,9 +193,12 @@ internal ExistsRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceExists;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceExists;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
 	public ExistsRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public ExistsRequestDescriptor<TDocument> SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public ExistsRequestDescriptor<TDocument> SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -144,6 +209,7 @@ internal ExistsRequestDescriptor()
 	public ExistsRequestDescriptor<TDocument> StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields);
 	public ExistsRequestDescriptor<TDocument> Version(long? version) => Qs("version", version);
 	public ExistsRequestDescriptor<TDocument> VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
+
 	public ExistsRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -161,9 +227,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns information about whether a document exists in an index.</para>
+/// </summary>
 public sealed partial class ExistsRequestDescriptor : RequestDescriptor<ExistsRequestDescriptor, ExistsRequestParameters>
 {
 	internal ExistsRequestDescriptor(Action<ExistsRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ExistsRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -172,9 +242,12 @@ internal ExistsRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceExists;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceExists;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
 	public ExistsRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public ExistsRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public ExistsRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -185,6 +258,7 @@ internal ExistsRequestDescriptor()
 	public ExistsRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields);
 	public ExistsRequestDescriptor Version(long? version) => Qs("version", version);
 	public ExistsRequestDescriptor VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
+
 	public ExistsRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsResponse.g.cs
index 9f843fb3fc3..627b2f59667 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsResponse.g.cs
@@ -15,15 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ExistsResponse : ElasticsearchResponse
 {
-	public bool Exists => ApiCallDetails is { HasSuccessfulStatusCode: true, HttpStatusCode: 200 };
+	public bool Exists => ApiCallDetails is
+	{
+		HasSuccessfulStatusCode: true, HttpStatusCode: 200
+	};
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsSourceRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsSourceRequest.g.cs
index af189d9f21b..a25a9df84b9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsSourceRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsSourceRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,78 +27,133 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class ExistsSourceRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether to perform the operation in realtime or search mode</para>
+	/// </summary>
 	public bool? Realtime { get => Q<bool?>("realtime"); set => Q("realtime", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Refresh the shard containing the document before performing the operation</para>
+	/// </summary>
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or a list of fields to return</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A list of fields to exclude from the returned _source field</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A list of fields to extract and return from the _source field</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit version number for concurrency control</para>
+	/// </summary>
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific version type</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a document source exists in an index.</para>
+/// </summary>
 public sealed partial class ExistsSourceRequest : PlainRequest<ExistsSourceRequestParameters>
 {
 	public ExistsSourceRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceExistsSource;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceExistsSource;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>Specify whether to perform the operation in realtime or search mode</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Realtime { get => Q<bool?>("realtime"); set => Q("realtime", value); }
 
+	/// <summary>
+	/// <para>Refresh the shard containing the document before performing the operation</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or a list of fields to return</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
+	/// <summary>
+	/// <para>A list of fields to exclude from the returned _source field</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
+	/// <summary>
+	/// <para>A list of fields to extract and return from the _source field</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
+	/// <summary>
+	/// <para>Explicit version number for concurrency control</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
+	/// <summary>
+	/// <para>Specific version type</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a document source exists in an index.</para>
+/// </summary>
 public sealed partial class ExistsSourceRequestDescriptor<TDocument> : RequestDescriptor<ExistsSourceRequestDescriptor<TDocument>, ExistsSourceRequestParameters>
 {
 	internal ExistsSourceRequestDescriptor(Action<ExistsSourceRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ExistsSourceRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -125,9 +182,12 @@ internal ExistsSourceRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceExistsSource;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceExistsSource;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
 	public ExistsSourceRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public ExistsSourceRequestDescriptor<TDocument> SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public ExistsSourceRequestDescriptor<TDocument> SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -137,6 +197,7 @@ internal ExistsSourceRequestDescriptor()
 	public ExistsSourceRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	public ExistsSourceRequestDescriptor<TDocument> Version(long? version) => Qs("version", version);
 	public ExistsSourceRequestDescriptor<TDocument> VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
+
 	public ExistsSourceRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -154,9 +215,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns information about whether a document source exists in an index.</para>
+/// </summary>
 public sealed partial class ExistsSourceRequestDescriptor : RequestDescriptor<ExistsSourceRequestDescriptor, ExistsSourceRequestParameters>
 {
 	internal ExistsSourceRequestDescriptor(Action<ExistsSourceRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ExistsSourceRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -165,9 +230,12 @@ internal ExistsSourceRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceExistsSource;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceExistsSource;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
 	public ExistsSourceRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public ExistsSourceRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public ExistsSourceRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -177,6 +245,7 @@ internal ExistsSourceRequestDescriptor()
 	public ExistsSourceRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	public ExistsSourceRequestDescriptor Version(long? version) => Qs("version", version);
 	public ExistsSourceRequestDescriptor VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
+
 	public ExistsSourceRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsSourceResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsSourceResponse.g.cs
index ecb3adc2150..7b6535e1a3e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsSourceResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExistsSourceResponse.g.cs
@@ -15,15 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ExistsSourceResponse : ElasticsearchResponse
 {
-	public bool Exists => ApiCallDetails is { HasSuccessfulStatusCode: true, HttpStatusCode: 200 };
+	public bool Exists => ApiCallDetails is
+	{
+		HasSuccessfulStatusCode: true, HttpStatusCode: 200
+	};
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainRequest.g.cs
index f41c8638d24..2d6f11e9735 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,99 +27,168 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class ExplainRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The analyzer for the query string query</para>
+	/// </summary>
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether wildcards and prefix queries in the query string query should be analyzed (default: false)</para>
+	/// </summary>
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The default field for query string query (default: _all)</para>
+	/// </summary>
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or a list of fields to return</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A list of fields to exclude from the returned _source field</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A list of fields to extract and return from the _source field</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of stored fields to return in the response</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("stored_fields"); set => Q("stored_fields", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Query in the Lucene query string syntax</para>
+	/// </summary>
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 }
 
+/// <summary>
+/// <para>Returns information about why a specific matches (or doesn't match) a query.</para>
+/// </summary>
 public sealed partial class ExplainRequest : PlainRequest<ExplainRequestParameters>
 {
 	public ExplainRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceExplain;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceExplain;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>The analyzer for the query string query</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
+	/// <summary>
+	/// <para>Specify whether wildcards and prefix queries in the query string query should be analyzed (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
+	/// <summary>
+	/// <para>The default field for query string query (default: _all)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or a list of fields to return</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
+	/// <summary>
+	/// <para>A list of fields to exclude from the returned _source field</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
+	/// <summary>
+	/// <para>A list of fields to extract and return from the _source field</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of stored fields to return in the response</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("stored_fields"); set => Q("stored_fields", value); }
 
+	/// <summary>
+	/// <para>Query in the Lucene query string syntax</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
 }
 
+/// <summary>
+/// <para>Returns information about why a specific matches (or doesn't match) a query.</para>
+/// </summary>
 public sealed partial class ExplainRequestDescriptor<TDocument> : RequestDescriptor<ExplainRequestDescriptor<TDocument>, ExplainRequestParameters>
 {
 	internal ExplainRequestDescriptor(Action<ExplainRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ExplainRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -146,9 +217,12 @@ internal ExplainRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceExplain;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceExplain;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public ExplainRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public ExplainRequestDescriptor<TDocument> SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public ExplainRequestDescriptor<TDocument> SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -161,6 +235,7 @@ internal ExplainRequestDescriptor()
 	public ExplainRequestDescriptor<TDocument> QueryLuceneSyntax(string? q) => Qs("q", q);
 	public ExplainRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	public ExplainRequestDescriptor<TDocument> StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields);
+
 	public ExplainRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -174,9 +249,7 @@ public ExplainRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.I
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
 
 	public ExplainRequestDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
@@ -226,9 +299,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns information about why a specific matches (or doesn't match) a query.</para>
+/// </summary>
 public sealed partial class ExplainRequestDescriptor : RequestDescriptor<ExplainRequestDescriptor, ExplainRequestParameters>
 {
 	internal ExplainRequestDescriptor(Action<ExplainRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ExplainRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -237,9 +314,12 @@ internal ExplainRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceExplain;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceExplain;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public ExplainRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public ExplainRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public ExplainRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -252,6 +332,7 @@ internal ExplainRequestDescriptor()
 	public ExplainRequestDescriptor QueryLuceneSyntax(string? q) => Qs("q", q);
 	public ExplainRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	public ExplainRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields);
+
 	public ExplainRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -265,9 +346,7 @@ public ExplainRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName in
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> QueryDescriptorAction { get; set; }
 
 	public ExplainRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainResponse.g.cs
index 6fc1bb34568..2838c1f5497 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ExplainResponse.g.cs
@@ -15,28 +15,26 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ExplainResponse<TDocument> : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("explanation")]
 	public Elastic.Clients.Elasticsearch.Core.Explain.ExplanationDetail? Explanation { get; init; }
-
 	[JsonInclude, JsonPropertyName("get")]
 	public Elastic.Clients.Elasticsearch.InlineGet<TDocument>? Get { get; init; }
-
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("matched")]
 	public bool Matched { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsRequest.g.cs
index 17ad1937b19..d71f2eef54c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,32 +27,49 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class FieldCapsRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If false, the request returns an error if any wildcard expression, index alias,<br/>or `_all` value targets only missing or closed indices. This behavior applies even if the request targets other open indices. For example, a request<br/>targeting `foo*,bar*` returns an error if an index starts with foo but no index starts with bar.</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Type of index that wildcard patterns can match. If the request can target data streams, this argument determines whether wildcard expressions match hidden data streams. Supports comma-separated values, such as `open,hidden`.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Comma-separated list of fields to retrieve capabilities for. Wildcard (`*`) expressions are supported.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("fields"); set => Q("fields", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If `true`, missing or closed indices are not included in the response.</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, unmapped fields are included in the response.</para>
+	/// </summary>
 	public bool? IncludeUnmapped { get => Q<bool?>("include_unmapped"); set => Q("include_unmapped", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>An optional set of filters: can include +metadata,-metadata,-nested,-multifield,-parent</para>
+	/// </summary>
 	public string? Filters { get => Q<string?>("filters"); set => Q("filters", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Only return results for fields that have one of the types in the list</para>
+	/// </summary>
 	public ICollection<string>? Types { get => Q<ICollection<string>?>("types"); set => Q("types", value); }
 }
 
+/// <summary>
+/// <para>The field capabilities API returns the information about the capabilities of fields among multiple indices.<br/>The field capabilities API returns runtime fields like any other field. For example, a runtime field with a type<br/>of keyword is returned as any other field that belongs to the `keyword` family.</para>
+/// </summary>
 public sealed partial class FieldCapsRequest : PlainRequest<FieldCapsRequestParameters>
 {
 	public FieldCapsRequest()
@@ -61,47 +80,84 @@ public FieldCapsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceFieldCaps;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceFieldCaps;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>If false, the request returns an error if any wildcard expression, index alias,<br/>or `_all` value targets only missing or closed indices. This behavior applies even if the request targets other open indices. For example, a request<br/>targeting `foo*,bar*` returns an error if an index starts with foo but no index starts with bar.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Type of index that wildcard patterns can match. If the request can target data streams, this argument determines whether wildcard expressions match hidden data streams. Supports comma-separated values, such as `open,hidden`.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Comma-separated list of fields to retrieve capabilities for. Wildcard (`*`) expressions are supported.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("fields"); set => Q("fields", value); }
 
+	/// <summary>
+	/// <para>If `true`, missing or closed indices are not included in the response.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>If true, unmapped fields are included in the response.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IncludeUnmapped { get => Q<bool?>("include_unmapped"); set => Q("include_unmapped", value); }
 
+	/// <summary>
+	/// <para>An optional set of filters: can include +metadata,-metadata,-nested,-multifield,-parent</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Filters { get => Q<string?>("filters"); set => Q("filters", value); }
 
+	/// <summary>
+	/// <para>Only return results for fields that have one of the types in the list</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<string>? Types { get => Q<ICollection<string>?>("types"); set => Q("types", value); }
 
+	/// <summary>
+	/// <para>Allows to filter indices if the provided query rewrites to match_none on every shard.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("index_filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilter { get; set; }
 
+	/// <summary>
+	/// <para>Defines ad-hoc runtime fields in the request similar to the way it is done in search requests.<br/>These fields exist only as part of the query and take precedence over fields defined with the same name in the index mappings.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 }
 
+/// <summary>
+/// <para>The field capabilities API returns the information about the capabilities of fields among multiple indices.<br/>The field capabilities API returns runtime fields like any other field. For example, a runtime field with a type<br/>of keyword is returned as any other field that belongs to the `keyword` family.</para>
+/// </summary>
 public sealed partial class FieldCapsRequestDescriptor<TDocument> : RequestDescriptor<FieldCapsRequestDescriptor<TDocument>, FieldCapsRequestParameters>
 {
 	internal FieldCapsRequestDescriptor(Action<FieldCapsRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FieldCapsRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceFieldCaps;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceFieldCaps;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public FieldCapsRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public FieldCapsRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public FieldCapsRequestDescriptor<TDocument> Fields(Elastic.Clients.Elasticsearch.Fields? fields) => Qs("fields", fields);
@@ -109,6 +165,7 @@ public FieldCapsRequestDescriptor()
 	public FieldCapsRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public FieldCapsRequestDescriptor<TDocument> IncludeUnmapped(bool? includeUnmapped = true) => Qs("include_unmapped", includeUnmapped);
 	public FieldCapsRequestDescriptor<TDocument> Types(ICollection<string>? types) => Qs("types", types);
+
 	public FieldCapsRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -116,13 +173,13 @@ public FieldCapsRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsear
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> IndexFilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> IndexFilterDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
 
+	/// <summary>
+	/// <para>Allows to filter indices if the provided query rewrites to match_none on every shard.</para>
+	/// </summary>
 	public FieldCapsRequestDescriptor<TDocument> IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? indexFilter)
 	{
 		IndexFilterDescriptor = null;
@@ -147,6 +204,9 @@ public FieldCapsRequestDescriptor<TDocument> IndexFilter(Action<QueryDsl.QueryDe
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines ad-hoc runtime fields in the request similar to the way it is done in search requests.<br/>These fields exist only as part of the query and take precedence over fields defined with the same name in the index mappings.</para>
+	/// </summary>
 	public FieldCapsRequestDescriptor<TDocument> RuntimeMappings(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeMappingsValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
@@ -182,16 +242,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>The field capabilities API returns the information about the capabilities of fields among multiple indices.<br/>The field capabilities API returns runtime fields like any other field. For example, a runtime field with a type<br/>of keyword is returned as any other field that belongs to the `keyword` family.</para>
+/// </summary>
 public sealed partial class FieldCapsRequestDescriptor : RequestDescriptor<FieldCapsRequestDescriptor, FieldCapsRequestParameters>
 {
 	internal FieldCapsRequestDescriptor(Action<FieldCapsRequestDescriptor> configure) => configure.Invoke(this);
+
 	public FieldCapsRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceFieldCaps;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceFieldCaps;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public FieldCapsRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public FieldCapsRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public FieldCapsRequestDescriptor Fields(Elastic.Clients.Elasticsearch.Fields? fields) => Qs("fields", fields);
@@ -199,6 +266,7 @@ public FieldCapsRequestDescriptor()
 	public FieldCapsRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public FieldCapsRequestDescriptor IncludeUnmapped(bool? includeUnmapped = true) => Qs("include_unmapped", includeUnmapped);
 	public FieldCapsRequestDescriptor Types(ICollection<string>? types) => Qs("types", types);
+
 	public FieldCapsRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -206,13 +274,13 @@ public FieldCapsRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices?
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor IndexFilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> IndexFilterDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
 
+	/// <summary>
+	/// <para>Allows to filter indices if the provided query rewrites to match_none on every shard.</para>
+	/// </summary>
 	public FieldCapsRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? indexFilter)
 	{
 		IndexFilterDescriptor = null;
@@ -237,6 +305,9 @@ public FieldCapsRequestDescriptor IndexFilter(Action<QueryDsl.QueryDescriptor> c
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines ad-hoc runtime fields in the request similar to the way it is done in search requests.<br/>These fields exist only as part of the query and take precedence over fields defined with the same name in the index mappings.</para>
+	/// </summary>
 	public FieldCapsRequestDescriptor RuntimeMappings(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeMappingsValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsResponse.g.cs
index 4d81fd5f3b0..c5b80a6e911 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/FieldCapsResponse.g.cs
@@ -15,20 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class FieldCapsResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("fields")]
 	[ReadOnlyFieldDictionaryConverter(typeof(IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Core.FieldCaps.FieldCapability>))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Core.FieldCaps.FieldCapability>> Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexName> Indices { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetRequest.g.cs
index eb27831c8a1..f7a02512086 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,84 +27,144 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class GetRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specifies the node or shard the operation should be performed on. Random by default.</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Boolean) If true, the request is real-time as opposed to near-real-time.</para>
+	/// </summary>
 	public bool? Realtime { get => Q<bool?>("realtime"); set => Q("realtime", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, Elasticsearch refreshes the affected shards to make this operation visible to search. If false, do nothing with refreshes.</para>
+	/// </summary>
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Target the specified primary shard.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or a list of fields to return.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of source fields to exclude in the response.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of source fields to include in the response.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of stored fields to return in the response</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("stored_fields"); set => Q("stored_fields", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit version number for concurrency control. The specified version must match the current version of the document for the request to succeed.</para>
+	/// </summary>
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific version type: internal, external, external_gte.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 }
 
+/// <summary>
+/// <para>Returns a document.</para>
+/// </summary>
 public sealed partial class GetRequest : PlainRequest<GetRequestParameters>
 {
 	public GetRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Specifies the node or shard the operation should be performed on. Random by default.</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>Boolean) If true, the request is real-time as opposed to near-real-time.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Realtime { get => Q<bool?>("realtime"); set => Q("realtime", value); }
 
+	/// <summary>
+	/// <para>If true, Elasticsearch refreshes the affected shards to make this operation visible to search. If false, do nothing with refreshes.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>Target the specified primary shard.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or a list of fields to return.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of source fields to exclude in the response.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of source fields to include in the response.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of stored fields to return in the response</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("stored_fields"); set => Q("stored_fields", value); }
 
+	/// <summary>
+	/// <para>Explicit version number for concurrency control. The specified version must match the current version of the document for the request to succeed.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
+	/// <summary>
+	/// <para>Specific version type: internal, external, external_gte.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 }
 
+/// <summary>
+/// <para>Returns a document.</para>
+/// </summary>
 public sealed partial class GetRequestDescriptor<TDocument> : RequestDescriptor<GetRequestDescriptor<TDocument>, GetRequestParameters>
 {
 	internal GetRequestDescriptor(Action<GetRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -131,9 +193,12 @@ internal GetRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public GetRequestDescriptor<TDocument> SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public GetRequestDescriptor<TDocument> SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -144,6 +209,7 @@ internal GetRequestDescriptor()
 	public GetRequestDescriptor<TDocument> StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields);
 	public GetRequestDescriptor<TDocument> Version(long? version) => Qs("version", version);
 	public GetRequestDescriptor<TDocument> VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
+
 	public GetRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -161,9 +227,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns a document.</para>
+/// </summary>
 public sealed partial class GetRequestDescriptor : RequestDescriptor<GetRequestDescriptor, GetRequestParameters>
 {
 	internal GetRequestDescriptor(Action<GetRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -172,9 +242,12 @@ internal GetRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public GetRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public GetRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -185,6 +258,7 @@ internal GetRequestDescriptor()
 	public GetRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields);
 	public GetRequestDescriptor Version(long? version) => Qs("version", version);
 	public GetRequestDescriptor VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
+
 	public GetRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetResponse.g.cs
index 4ca6c6421c3..f6fe231f9f4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetResponse.g.cs
@@ -15,41 +15,35 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class GetResponse<TDocument> : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.FieldValues? Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { get; init; }
-
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("_primary_term")]
 	public long? PrimaryTerm { get; init; }
-
 	[JsonInclude, JsonPropertyName("_routing")]
 	public string? Routing { get; init; }
-
 	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long? SeqNo { get; init; }
-
 	[JsonInclude, JsonPropertyName("_source")]
 	[SourceConverter]
 	public TDocument? Source { get; init; }
-
 	[JsonInclude, JsonPropertyName("_version")]
 	public long? Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextRequest.g.cs
index 94522b33ef8..e21568eb1d1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,29 +27,41 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class GetScriptContextRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Returns all script contexts.</para>
+/// </summary>
 public sealed partial class GetScriptContextRequest : PlainRequest<GetScriptContextRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScriptContext;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGetScriptContext;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Returns all script contexts.</para>
+/// </summary>
 public sealed partial class GetScriptContextRequestDescriptor : RequestDescriptor<GetScriptContextRequestDescriptor, GetScriptContextRequestParameters>
 {
 	internal GetScriptContextRequestDescriptor(Action<GetScriptContextRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetScriptContextRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScriptContext;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGetScriptContext;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextResponse.g.cs
index 1fc4fe86a6d..8df83730531 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptContextResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class GetScriptContextResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("contexts")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesRequest.g.cs
index 4631b69a3ce..20fe73b2c2e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,29 +27,41 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class GetScriptLanguagesRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Returns available script types, languages and contexts</para>
+/// </summary>
 public sealed partial class GetScriptLanguagesRequest : PlainRequest<GetScriptLanguagesRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScriptLanguages;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGetScriptLanguages;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Returns available script types, languages and contexts</para>
+/// </summary>
 public sealed partial class GetScriptLanguagesRequestDescriptor : RequestDescriptor<GetScriptLanguagesRequestDescriptor, GetScriptLanguagesRequestParameters>
 {
 	internal GetScriptLanguagesRequestDescriptor(Action<GetScriptLanguagesRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetScriptLanguagesRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScriptLanguages;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGetScriptLanguages;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesResponse.g.cs
index 64a402002b3..79f44251872 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptLanguagesResponse.g.cs
@@ -15,19 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class GetScriptLanguagesResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("language_contexts")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.GetScriptLanguages.LanguageContext> LanguageContexts { get; init; }
-
 	[JsonInclude, JsonPropertyName("types_allowed")]
 	public IReadOnlyCollection<string> TypesAllowed { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptRequest.g.cs
index 54ceef06cf5..4ccd78a9ee7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,30 +27,45 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class GetScriptRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns a script.</para>
+/// </summary>
 public sealed partial class GetScriptRequest : PlainRequest<GetScriptRequestParameters>
 {
 	public GetScriptRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScript;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGetScript;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns a script.</para>
+/// </summary>
 public sealed partial class GetScriptRequestDescriptor<TDocument> : RequestDescriptor<GetScriptRequestDescriptor<TDocument>, GetScriptRequestParameters>
 {
 	internal GetScriptRequestDescriptor(Action<GetScriptRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetScriptRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -57,10 +74,14 @@ internal GetScriptRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScript;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGetScript;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetScriptRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+
 	public GetScriptRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -72,9 +93,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns a script.</para>
+/// </summary>
 public sealed partial class GetScriptRequestDescriptor : RequestDescriptor<GetScriptRequestDescriptor, GetScriptRequestParameters>
 {
 	internal GetScriptRequestDescriptor(Action<GetScriptRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetScriptRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -83,10 +108,14 @@ internal GetScriptRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetScript;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGetScript;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetScriptRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+
 	public GetScriptRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptResponse.g.cs
index 91cdd6443b0..c238fa72aeb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetScriptResponse.g.cs
@@ -15,22 +15,22 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class GetScriptResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { get; init; }
-
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.StoredScript? Script { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceRequest.g.cs
index ed9b8b60a99..445f11df350 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,84 +27,136 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class GetSourceRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specifies the node or shard the operation should be performed on. Random by default.</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Boolean) If true, the request is real-time as opposed to near-real-time.</para>
+	/// </summary>
 	public bool? Realtime { get => Q<bool?>("realtime"); set => Q("realtime", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, Elasticsearch refreshes the affected shards to make this operation visible to search. If false, do nothing with refreshes.</para>
+	/// </summary>
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Target the specified primary shard.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or a list of fields to return.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of source fields to exclude in the response.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of source fields to include in the response.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
-
-	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("stored_fields"); set => Q("stored_fields", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit version number for concurrency control. The specified version must match the current version of the document for the request to succeed.</para>
+	/// </summary>
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific version type: internal, external, external_gte.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 }
 
+/// <summary>
+/// <para>Returns the source of a document.</para>
+/// </summary>
 public sealed partial class GetSourceRequest : PlainRequest<GetSourceRequestParameters>
 {
 	public GetSourceRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetSource;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGetSource;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Specifies the node or shard the operation should be performed on. Random by default.</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>Boolean) If true, the request is real-time as opposed to near-real-time.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Realtime { get => Q<bool?>("realtime"); set => Q("realtime", value); }
 
+	/// <summary>
+	/// <para>If true, Elasticsearch refreshes the affected shards to make this operation visible to search. If false, do nothing with refreshes.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>Target the specified primary shard.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>True or false to return the _source field or not, or a list of fields to return.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of source fields to exclude in the response.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of source fields to include in the response.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
-
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("stored_fields"); set => Q("stored_fields", value); }
 
+	/// <summary>
+	/// <para>Explicit version number for concurrency control. The specified version must match the current version of the document for the request to succeed.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
+	/// <summary>
+	/// <para>Specific version type: internal, external, external_gte.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 }
 
+/// <summary>
+/// <para>Returns the source of a document.</para>
+/// </summary>
 public sealed partial class GetSourceRequestDescriptor<TDocument> : RequestDescriptor<GetSourceRequestDescriptor<TDocument>, GetSourceRequestParameters>
 {
 	internal GetSourceRequestDescriptor(Action<GetSourceRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetSourceRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -131,9 +185,12 @@ internal GetSourceRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetSource;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGetSource;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetSourceRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public GetSourceRequestDescriptor<TDocument> SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public GetSourceRequestDescriptor<TDocument> SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -144,6 +201,7 @@ internal GetSourceRequestDescriptor()
 	public GetSourceRequestDescriptor<TDocument> StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields);
 	public GetSourceRequestDescriptor<TDocument> Version(long? version) => Qs("version", version);
 	public GetSourceRequestDescriptor<TDocument> VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
+
 	public GetSourceRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -161,9 +219,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns the source of a document.</para>
+/// </summary>
 public sealed partial class GetSourceRequestDescriptor : RequestDescriptor<GetSourceRequestDescriptor, GetSourceRequestParameters>
 {
 	internal GetSourceRequestDescriptor(Action<GetSourceRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetSourceRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -172,9 +234,12 @@ internal GetSourceRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceGetSource;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceGetSource;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetSourceRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public GetSourceRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public GetSourceRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -185,6 +250,7 @@ internal GetSourceRequestDescriptor()
 	public GetSourceRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields);
 	public GetSourceRequestDescriptor Version(long? version) => Qs("version", version);
 	public GetSourceRequestDescriptor VersionType(Elastic.Clients.Elasticsearch.VersionType? versionType) => Qs("version_type", versionType);
+
 	public GetSourceRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceResponse.g.cs
index de84738cfda..6da0fe0abd4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/GetSourceResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class GetSourceResponse<TDocument> : ElasticsearchResponse
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexRequest.g.cs
index 433f6b9ad59..b5c83cc9559 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,48 +27,71 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class CloneIndexRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Set the number of active shards to wait for on the cloned index before the operation returns.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Clones an index</para>
+/// </summary>
 public sealed partial class CloneIndexRequest : PlainRequest<CloneIndexRequestParameters>
 {
 	public CloneIndexRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target) : base(r => r.Required("index", index).Required("target", target))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClone;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementClone;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Set the number of active shards to wait for on the cloned index before the operation returns.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
-
 	[JsonInclude, JsonPropertyName("aliases")]
 	public IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? Aliases { get; set; }
-
 	[JsonInclude, JsonPropertyName("settings")]
 	public IDictionary<string, object>? Settings { get; set; }
 }
 
+/// <summary>
+/// <para>Clones an index</para>
+/// </summary>
 public sealed partial class CloneIndexRequestDescriptor<TDocument> : RequestDescriptor<CloneIndexRequestDescriptor<TDocument>, CloneIndexRequestParameters>
 {
 	internal CloneIndexRequestDescriptor(Action<CloneIndexRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CloneIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target) : base(r => r.Required("index", index).Required("target", target))
 	{
 	}
@@ -75,12 +100,16 @@ internal CloneIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClone;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementClone;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public CloneIndexRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public CloneIndexRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public CloneIndexRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public CloneIndexRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName index)
 	{
 		RouteValues.Required("index", index);
@@ -94,7 +123,6 @@ public CloneIndexRequestDescriptor<TDocument> Target(Elastic.Clients.Elasticsear
 	}
 
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
-
 	private IDictionary<string, object>? SettingsValue { get; set; }
 
 	public CloneIndexRequestDescriptor<TDocument> Aliases(Func<FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>, FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>> selector)
@@ -128,9 +156,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Clones an index</para>
+/// </summary>
 public sealed partial class CloneIndexRequestDescriptor : RequestDescriptor<CloneIndexRequestDescriptor, CloneIndexRequestParameters>
 {
 	internal CloneIndexRequestDescriptor(Action<CloneIndexRequestDescriptor> configure) => configure.Invoke(this);
+
 	public CloneIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Name target) : base(r => r.Required("index", index).Required("target", target))
 	{
 	}
@@ -139,12 +171,16 @@ internal CloneIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClone;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementClone;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public CloneIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public CloneIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public CloneIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public CloneIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
 	{
 		RouteValues.Required("index", index);
@@ -158,7 +194,6 @@ public CloneIndexRequestDescriptor Target(Elastic.Clients.Elasticsearch.Name tar
 	}
 
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
-
 	private IDictionary<string, object>? SettingsValue { get; set; }
 
 	public CloneIndexRequestDescriptor Aliases(Func<FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>, FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>> selector)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexResponse.g.cs
index ffad0a6216c..79804cc6d4f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloneIndexResponse.g.cs
@@ -15,22 +15,22 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class CloneIndexResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards_acknowledged")]
 	public bool ShardsAcknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexRequest.g.cs
index c92c6fcdeed..767c87c0a2d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,60 +27,100 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class CloseIndexRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Sets the number of active shards to wait for before the operation returns.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Closes an index.</para>
+/// </summary>
 public sealed partial class CloseIndexRequest : PlainRequest<CloseIndexRequestParameters>
 {
 	public CloseIndexRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClose;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementClose;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Sets the number of active shards to wait for before the operation returns.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Closes an index.</para>
+/// </summary>
 public sealed partial class CloseIndexRequestDescriptor<TDocument> : RequestDescriptor<CloseIndexRequestDescriptor<TDocument>, CloseIndexRequestParameters>
 {
 	internal CloseIndexRequestDescriptor(Action<CloseIndexRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CloseIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -87,15 +129,19 @@ internal CloseIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClose;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementClose;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public CloseIndexRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public CloseIndexRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public CloseIndexRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public CloseIndexRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public CloseIndexRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public CloseIndexRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public CloseIndexRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -107,9 +153,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Closes an index.</para>
+/// </summary>
 public sealed partial class CloseIndexRequestDescriptor : RequestDescriptor<CloseIndexRequestDescriptor, CloseIndexRequestParameters>
 {
 	internal CloseIndexRequestDescriptor(Action<CloseIndexRequestDescriptor> configure) => configure.Invoke(this);
+
 	public CloseIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -118,15 +168,19 @@ internal CloseIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementClose;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementClose;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public CloseIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public CloseIndexRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public CloseIndexRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public CloseIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public CloseIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public CloseIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public CloseIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs
index f68afc75920..f1f79fedad8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CloseIndexResponse.g.cs
@@ -15,23 +15,23 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class CloseIndexResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-
 	[JsonInclude, JsonPropertyName("indices")]
 	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.IndexManagement.CloseIndexResult))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.CloseIndexResult> Indices { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards_acknowledged")]
 	public bool ShardsAcknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateDataStreamRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateDataStreamRequest.g.cs
index 03935ad9a42..db42ce2c76c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateDataStreamRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateDataStreamRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,26 +27,35 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class CreateDataStreamRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Creates a data stream</para>
+/// </summary>
 public sealed partial class CreateDataStreamRequest : PlainRequest<CreateDataStreamRequestParameters>
 {
 	public CreateDataStreamRequest(Elastic.Clients.Elasticsearch.DataStreamName name) : base(r => r.Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementCreateDataStream;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementCreateDataStream;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Creates a data stream</para>
+/// </summary>
 public sealed partial class CreateDataStreamRequestDescriptor : RequestDescriptor<CreateDataStreamRequestDescriptor, CreateDataStreamRequestParameters>
 {
 	internal CreateDataStreamRequestDescriptor(Action<CreateDataStreamRequestDescriptor> configure) => configure.Invoke(this);
+
 	public CreateDataStreamRequestDescriptor(Elastic.Clients.Elasticsearch.DataStreamName name) : base(r => r.Required("name", name))
 	{
 	}
@@ -53,9 +64,12 @@ internal CreateDataStreamRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementCreateDataStream;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementCreateDataStream;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => false;
+
 	public CreateDataStreamRequestDescriptor Name(Elastic.Clients.Elasticsearch.DataStreamName name)
 	{
 		RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateDataStreamResponse.g.cs
index 9552cfc45b9..3df6b64fa9f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateDataStreamResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class CreateDataStreamResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexRequest.g.cs
index d3aaf6b8bac..d869d5198c9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,51 +27,77 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class CreateIndexRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Set the number of active shards to wait for before the operation returns.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Creates an index with optional settings and mappings.</para>
+/// </summary>
 public sealed partial class CreateIndexRequest : PlainRequest<CreateIndexRequestParameters>
 {
 	public CreateIndexRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementCreate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementCreate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Set the number of active shards to wait for before the operation returns.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
-
 	[JsonInclude, JsonPropertyName("aliases")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Name, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? Aliases { get; set; }
 
+	/// <summary>
+	/// <para>Mapping for fields in the index. If specified, this mapping can include:<br/>- Field names<br/>- Field data types<br/>- Mapping parameters</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping? Mappings { get; set; }
-
 	[JsonInclude, JsonPropertyName("settings")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? Settings { get; set; }
 }
 
+/// <summary>
+/// <para>Creates an index with optional settings and mappings.</para>
+/// </summary>
 public sealed partial class CreateIndexRequestDescriptor<TDocument> : RequestDescriptor<CreateIndexRequestDescriptor<TDocument>, CreateIndexRequestParameters>
 {
 	internal CreateIndexRequestDescriptor(Action<CreateIndexRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CreateIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index))
 	{
 	}
@@ -82,12 +110,16 @@ internal CreateIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementCreate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementCreate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public CreateIndexRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public CreateIndexRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public CreateIndexRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public CreateIndexRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName index)
 	{
 		RouteValues.Required("index", index);
@@ -95,19 +127,16 @@ public CreateIndexRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsear
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.TypeMapping? MappingsValue { get; set; }
-
 	private Mapping.TypeMappingDescriptor<TDocument> MappingsDescriptor { get; set; }
-
 	private Action<Mapping.TypeMappingDescriptor<TDocument>> MappingsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? SettingsValue { get; set; }
-
 	private IndexSettingsDescriptor<TDocument> SettingsDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor<TDocument>> SettingsDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Name, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
 
+	/// <summary>
+	/// <para>Mapping for fields in the index. If specified, this mapping can include:<br/>- Field names<br/>- Field data types<br/>- Mapping parameters</para>
+	/// </summary>
 	public CreateIndexRequestDescriptor<TDocument> Mappings(Elastic.Clients.Elasticsearch.Mapping.TypeMapping? mappings)
 	{
 		MappingsDescriptor = null;
@@ -207,9 +236,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Creates an index with optional settings and mappings.</para>
+/// </summary>
 public sealed partial class CreateIndexRequestDescriptor : RequestDescriptor<CreateIndexRequestDescriptor, CreateIndexRequestParameters>
 {
 	internal CreateIndexRequestDescriptor(Action<CreateIndexRequestDescriptor> configure) => configure.Invoke(this);
+
 	public CreateIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index))
 	{
 	}
@@ -218,12 +251,16 @@ internal CreateIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementCreate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementCreate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public CreateIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public CreateIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public CreateIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public CreateIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
 	{
 		RouteValues.Required("index", index);
@@ -231,19 +268,16 @@ public CreateIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexNam
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.TypeMapping? MappingsValue { get; set; }
-
 	private Mapping.TypeMappingDescriptor MappingsDescriptor { get; set; }
-
 	private Action<Mapping.TypeMappingDescriptor> MappingsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? SettingsValue { get; set; }
-
 	private IndexSettingsDescriptor SettingsDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor> SettingsDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Name, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
 
+	/// <summary>
+	/// <para>Mapping for fields in the index. If specified, this mapping can include:<br/>- Field names<br/>- Field data types<br/>- Mapping parameters</para>
+	/// </summary>
 	public CreateIndexRequestDescriptor Mappings(Elastic.Clients.Elasticsearch.Mapping.TypeMapping? mappings)
 	{
 		MappingsDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs
index 59f82627732..37986558ddf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/CreateIndexResponse.g.cs
@@ -15,22 +15,22 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class CreateIndexResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards_acknowledged")]
 	public bool ShardsAcknowledged { get; init; }
 }
\ No newline at end of file
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 47da0ba42bf..ebef10fce5a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteAliasRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteAliasRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,36 +27,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class DeleteAliasRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit timestamp for the document</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Deletes an alias.</para>
+/// </summary>
 public sealed partial class DeleteAliasRequest : PlainRequest<DeleteAliasRequestParameters>
 {
 	public DeleteAliasRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.Clients.Elasticsearch.Names name) : base(r => r.Required("index", indices).Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDeleteAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit timestamp for the document</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Deletes an alias.</para>
+/// </summary>
 public sealed partial class DeleteAliasRequestDescriptor<TDocument> : RequestDescriptor<DeleteAliasRequestDescriptor<TDocument>, DeleteAliasRequestParameters>
 {
 	internal DeleteAliasRequestDescriptor(Action<DeleteAliasRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DeleteAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices, Elastic.Clients.Elasticsearch.Names name) : base(r => r.Required("index", indices).Required("name", name))
 	{
 	}
@@ -63,11 +85,15 @@ internal DeleteAliasRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDeleteAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	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);
@@ -85,9 +111,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Deletes an alias.</para>
+/// </summary>
 public sealed partial class DeleteAliasRequestDescriptor : RequestDescriptor<DeleteAliasRequestDescriptor, DeleteAliasRequestParameters>
 {
 	internal DeleteAliasRequestDescriptor(Action<DeleteAliasRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeleteAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices, Elastic.Clients.Elasticsearch.Names name) : base(r => r.Required("index", indices).Required("name", name))
 	{
 	}
@@ -96,11 +126,15 @@ internal DeleteAliasRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDeleteAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	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/DeleteAliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteAliasResponse.g.cs
index 879801e8831..31af3d46f6d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteAliasResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class DeleteAliasResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataStreamRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataStreamRequest.g.cs
index e039034f877..373cf07edc4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataStreamRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataStreamRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,30 +27,45 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class DeleteDataStreamRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether wildcard expressions should get expanded to open or closed indices (default: open)</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 }
 
+/// <summary>
+/// <para>Deletes a data stream.</para>
+/// </summary>
 public sealed partial class DeleteDataStreamRequest : PlainRequest<DeleteDataStreamRequestParameters>
 {
 	public DeleteDataStreamRequest(Elastic.Clients.Elasticsearch.DataStreamNames name) : base(r => r.Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteDataStream;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDeleteDataStream;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether wildcard expressions should get expanded to open or closed indices (default: open)</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 }
 
+/// <summary>
+/// <para>Deletes a data stream.</para>
+/// </summary>
 public sealed partial class DeleteDataStreamRequestDescriptor : RequestDescriptor<DeleteDataStreamRequestDescriptor, DeleteDataStreamRequestParameters>
 {
 	internal DeleteDataStreamRequestDescriptor(Action<DeleteDataStreamRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeleteDataStreamRequestDescriptor(Elastic.Clients.Elasticsearch.DataStreamNames name) : base(r => r.Required("name", name))
 	{
 	}
@@ -57,10 +74,14 @@ internal DeleteDataStreamRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteDataStream;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDeleteDataStream;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public DeleteDataStreamRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
+
 	public DeleteDataStreamRequestDescriptor Name(Elastic.Clients.Elasticsearch.DataStreamNames name)
 	{
 		RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataStreamResponse.g.cs
index d393e3e03ad..f9c4c59409c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteDataStreamResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class DeleteDataStreamResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexRequest.g.cs
index 084da21ba71..6b7765cb9a3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,54 +27,89 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class DeleteIndexRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Ignore if a wildcard expression resolves to no concrete indices (default: false)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether wildcard expressions should get expanded to open, closed, or hidden indices</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Ignore unavailable indexes (default: false)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Deletes an index.</para>
+/// </summary>
 public sealed partial class DeleteIndexRequest : PlainRequest<DeleteIndexRequestParameters>
 {
 	public DeleteIndexRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Ignore if a wildcard expression resolves to no concrete indices (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether wildcard expressions should get expanded to open, closed, or hidden indices</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Ignore unavailable indexes (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Deletes an index.</para>
+/// </summary>
 public sealed partial class DeleteIndexRequestDescriptor<TDocument> : RequestDescriptor<DeleteIndexRequestDescriptor<TDocument>, DeleteIndexRequestParameters>
 {
 	internal DeleteIndexRequestDescriptor(Action<DeleteIndexRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DeleteIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -81,14 +118,18 @@ internal DeleteIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public DeleteIndexRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public DeleteIndexRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public DeleteIndexRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public DeleteIndexRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public DeleteIndexRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
+
 	public DeleteIndexRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -100,9 +141,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Deletes an index.</para>
+/// </summary>
 public sealed partial class DeleteIndexRequestDescriptor : RequestDescriptor<DeleteIndexRequestDescriptor, DeleteIndexRequestParameters>
 {
 	internal DeleteIndexRequestDescriptor(Action<DeleteIndexRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeleteIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -111,14 +156,18 @@ internal DeleteIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDelete;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDelete;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public DeleteIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public DeleteIndexRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public DeleteIndexRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public DeleteIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public DeleteIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
+
 	public DeleteIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs
index afdd9600d13..f11cfcb8da2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexResponse.g.cs
@@ -15,19 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class DeleteIndexResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics? Shards { get; init; }
 }
\ No newline at end of file
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 c4d29013441..91c6f79e814 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,36 +27,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class DeleteIndexTemplateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>The provided <index-template> may contain multiple template names separated by a comma. If multiple template<br/>names are specified then there is no wildcard support and the provided names should match completely with<br/>existing templates.</para>
+/// </summary>
 public sealed partial class DeleteIndexTemplateRequest : PlainRequest<DeleteIndexTemplateRequestParameters>
 {
 	public DeleteIndexTemplateRequest(Elastic.Clients.Elasticsearch.Names name) : base(r => r.Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDeleteIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>The provided <index-template> may contain multiple template names separated by a comma. If multiple template<br/>names are specified then there is no wildcard support and the provided names should match completely with<br/>existing templates.</para>
+/// </summary>
 public sealed partial class DeleteIndexTemplateRequestDescriptor : RequestDescriptor<DeleteIndexTemplateRequestDescriptor, DeleteIndexTemplateRequestParameters>
 {
 	internal DeleteIndexTemplateRequestDescriptor(Action<DeleteIndexTemplateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeleteIndexTemplateRequestDescriptor(Elastic.Clients.Elasticsearch.Names name) : base(r => r.Required("name", name))
 	{
 	}
@@ -63,11 +85,15 @@ internal DeleteIndexTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDeleteIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	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/DeleteIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateResponse.g.cs
index c6742676422..f618e27479a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteIndexTemplateResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class DeleteIndexTemplateResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
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 7fcfede752e..15a7c90c101 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,36 +27,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class DeleteTemplateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Deletes an index template.</para>
+/// </summary>
 public sealed partial class DeleteTemplateRequest : PlainRequest<DeleteTemplateRequestParameters>
 {
 	public DeleteTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDeleteTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Deletes an index template.</para>
+/// </summary>
 public sealed partial class DeleteTemplateRequestDescriptor : RequestDescriptor<DeleteTemplateRequestDescriptor, DeleteTemplateRequestParameters>
 {
 	internal DeleteTemplateRequestDescriptor(Action<DeleteTemplateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeleteTemplateRequestDescriptor(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
@@ -63,11 +85,15 @@ internal DeleteTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementDeleteTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementDeleteTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	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/DeleteTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateResponse.g.cs
index 3ccc248c74f..98a4929c24d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/DeleteTemplateResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class DeleteTemplateResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsAliasRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsAliasRequest.g.cs
index 81e2836282e..31071e8449f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsAliasRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsAliasRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,23 +27,34 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class ExistsAliasRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a particular alias exists.</para>
+/// </summary>
 public sealed partial class ExistsAliasRequest : PlainRequest<ExistsAliasRequestParameters>
 {
 	public ExistsAliasRequest(Elastic.Clients.Elasticsearch.Names name) : base(r => r.Required("name", name))
@@ -52,25 +65,44 @@ public ExistsAliasRequest(Elastic.Clients.Elasticsearch.Indices? indices, Elasti
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementExistsAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementExistsAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a particular alias exists.</para>
+/// </summary>
 public sealed partial class ExistsAliasRequestDescriptor<TDocument> : RequestDescriptor<ExistsAliasRequestDescriptor<TDocument>, ExistsAliasRequestParameters>
 {
 	internal ExistsAliasRequestDescriptor(Action<ExistsAliasRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ExistsAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Names name) : base(r => r.Required("name", name))
 	{
 	}
@@ -83,13 +115,17 @@ internal ExistsAliasRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementExistsAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementExistsAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
 	public ExistsAliasRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public ExistsAliasRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public ExistsAliasRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public ExistsAliasRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
+
 	public ExistsAliasRequestDescriptor<TDocument> Name(Elastic.Clients.Elasticsearch.Names name)
 	{
 		RouteValues.Required("name", name);
@@ -107,9 +143,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns information about whether a particular alias exists.</para>
+/// </summary>
 public sealed partial class ExistsAliasRequestDescriptor : RequestDescriptor<ExistsAliasRequestDescriptor, ExistsAliasRequestParameters>
 {
 	internal ExistsAliasRequestDescriptor(Action<ExistsAliasRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ExistsAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Names name) : base(r => r.Required("name", name))
 	{
 	}
@@ -122,13 +162,17 @@ internal ExistsAliasRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementExistsAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementExistsAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
 	public ExistsAliasRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public ExistsAliasRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public ExistsAliasRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public ExistsAliasRequestDescriptor Local(bool? local = true) => Qs("local", local);
+
 	public ExistsAliasRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names name)
 	{
 		RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsAliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsAliasResponse.g.cs
index a6020683fd7..8d09788d9ff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsAliasResponse.g.cs
@@ -15,15 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ExistsAliasResponse : ElasticsearchResponse
 {
-	public bool Exists => ApiCallDetails is { HasSuccessfulStatusCode: true, HttpStatusCode: 200 };
+	public bool Exists => ApiCallDetails is
+	{
+		HasSuccessfulStatusCode: true, HttpStatusCode: 200
+	};
 }
\ No newline at end of file
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 a0635c05f8a..d05b58ddeda 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsIndexTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsIndexTemplateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,30 +27,45 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class ExistsIndexTemplateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a particular index template exists.</para>
+/// </summary>
 public sealed partial class ExistsIndexTemplateRequest : PlainRequest<ExistsIndexTemplateRequestParameters>
 {
 	public ExistsIndexTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementExistsIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementExistsIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a particular index template exists.</para>
+/// </summary>
 public sealed partial class ExistsIndexTemplateRequestDescriptor : RequestDescriptor<ExistsIndexTemplateRequestDescriptor, ExistsIndexTemplateRequestParameters>
 {
 	internal ExistsIndexTemplateRequestDescriptor(Action<ExistsIndexTemplateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ExistsIndexTemplateRequestDescriptor(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
@@ -57,10 +74,14 @@ internal ExistsIndexTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementExistsIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementExistsIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
 	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/ExistsIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsIndexTemplateResponse.g.cs
index bae7521a765..c3cee009c6e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsIndexTemplateResponse.g.cs
@@ -15,15 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ExistsIndexTemplateResponse : ElasticsearchResponse
 {
-	public bool Exists => ApiCallDetails is { HasSuccessfulStatusCode: true, HttpStatusCode: 200 };
+	public bool Exists => ApiCallDetails is
+	{
+		HasSuccessfulStatusCode: true, HttpStatusCode: 200
+	};
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsRequest.g.cs
index c03440aa143..839e4a7f3d9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,60 +27,100 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class ExistsRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Ignore if a wildcard expression resolves to no concrete indices (default: false)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether wildcard expressions should get expanded to open or closed indices (default: open)</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return settings in flat format (default: false)</para>
+	/// </summary>
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Ignore unavailable indexes (default: false)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to return all default setting for each of the indices.</para>
+	/// </summary>
 	public bool? IncludeDefaults { get => Q<bool?>("include_defaults"); set => Q("include_defaults", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a particular index exists.</para>
+/// </summary>
 public sealed partial class ExistsRequest : PlainRequest<ExistsRequestParameters>
 {
 	public ExistsRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementExists;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementExists;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Ignore if a wildcard expression resolves to no concrete indices (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether wildcard expressions should get expanded to open or closed indices (default: open)</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Return settings in flat format (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
+	/// <summary>
+	/// <para>Ignore unavailable indexes (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Whether to return all default setting for each of the indices.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IncludeDefaults { get => Q<bool?>("include_defaults"); set => Q("include_defaults", value); }
 
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a particular index exists.</para>
+/// </summary>
 public sealed partial class ExistsRequestDescriptor<TDocument> : RequestDescriptor<ExistsRequestDescriptor<TDocument>, ExistsRequestParameters>
 {
 	internal ExistsRequestDescriptor(Action<ExistsRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ExistsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -87,15 +129,19 @@ internal ExistsRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementExists;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementExists;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
 	public ExistsRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public ExistsRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public ExistsRequestDescriptor<TDocument> FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 	public ExistsRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public ExistsRequestDescriptor<TDocument> IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults);
 	public ExistsRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
+
 	public ExistsRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -107,9 +153,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns information about whether a particular index exists.</para>
+/// </summary>
 public sealed partial class ExistsRequestDescriptor : RequestDescriptor<ExistsRequestDescriptor, ExistsRequestParameters>
 {
 	internal ExistsRequestDescriptor(Action<ExistsRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ExistsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -118,15 +168,19 @@ internal ExistsRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementExists;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementExists;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
 	public ExistsRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public ExistsRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public ExistsRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 	public ExistsRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public ExistsRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults);
 	public ExistsRequestDescriptor Local(bool? local = true) => Qs("local", local);
+
 	public ExistsRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsResponse.g.cs
index a5a6be3eca9..1dc4064c711 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsResponse.g.cs
@@ -15,15 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ExistsResponse : ElasticsearchResponse
 {
-	public bool Exists => ApiCallDetails is { HasSuccessfulStatusCode: true, HttpStatusCode: 200 };
+	public bool Exists => ApiCallDetails is
+	{
+		HasSuccessfulStatusCode: true, HttpStatusCode: 200
+	};
 }
\ No newline at end of file
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 76a8b9b613c..71f769be18b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsTemplateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,42 +27,67 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class ExistsTemplateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return settings in flat format (default: false)</para>
+	/// </summary>
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout for connection to master node</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a particular index template exists.</para>
+/// </summary>
 public sealed partial class ExistsTemplateRequest : PlainRequest<ExistsTemplateRequestParameters>
 {
 	public ExistsTemplateRequest(Elastic.Clients.Elasticsearch.Names name) : base(r => r.Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementExistsTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementExistsTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Return settings in flat format (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout for connection to master node</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns information about whether a particular index template exists.</para>
+/// </summary>
 public sealed partial class ExistsTemplateRequestDescriptor : RequestDescriptor<ExistsTemplateRequestDescriptor, ExistsTemplateRequestParameters>
 {
 	internal ExistsTemplateRequestDescriptor(Action<ExistsTemplateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ExistsTemplateRequestDescriptor(Elastic.Clients.Elasticsearch.Names name) : base(r => r.Required("name", name))
 	{
 	}
@@ -69,12 +96,16 @@ internal ExistsTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementExistsTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementExistsTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal 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.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/ExistsTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsTemplateResponse.g.cs
index 881d6d12abe..e8b80489f83 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ExistsTemplateResponse.g.cs
@@ -15,15 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ExistsTemplateResponse : ElasticsearchResponse
 {
-	public bool Exists => ApiCallDetails is { HasSuccessfulStatusCode: true, HttpStatusCode: 200 };
+	public bool Exists => ApiCallDetails is
+	{
+		HasSuccessfulStatusCode: true, HttpStatusCode: 200
+	};
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FlushRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FlushRequest.g.cs
index ba42da76382..3ac058236ec 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FlushRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FlushRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,26 +27,39 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class FlushRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether a flush should be forced even if it is not necessarily needed ie. if no changes will be committed to the index. This is useful if transaction log IDs should be incremented even if no uncommitted changes are present. (This setting can be considered as internal)</para>
+	/// </summary>
 	public bool? Force { get => Q<bool?>("force"); set => Q("force", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If set to true the flush operation will block until the flush can be executed if another flush operation is already executing. The default is true. If set to false the flush will be skipped iff if another flush operation is already running.</para>
+	/// </summary>
 	public bool? WaitIfOngoing { get => Q<bool?>("wait_if_ongoing"); set => Q("wait_if_ongoing", value); }
 }
 
+/// <summary>
+/// <para>Performs the flush operation on one or more indices.</para>
+/// </summary>
 public sealed partial class FlushRequest : PlainRequest<FlushRequestParameters>
 {
 	public FlushRequest()
@@ -55,40 +70,66 @@ public FlushRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementFlush;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementFlush;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether a flush should be forced even if it is not necessarily needed ie. if no changes will be committed to the index. This is useful if transaction log IDs should be incremented even if no uncommitted changes are present. (This setting can be considered as internal)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Force { get => Q<bool?>("force"); set => Q("force", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>If set to true the flush operation will block until the flush can be executed if another flush operation is already executing. The default is true. If set to false the flush will be skipped iff if another flush operation is already running.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? WaitIfOngoing { get => Q<bool?>("wait_if_ongoing"); set => Q("wait_if_ongoing", value); }
 }
 
+/// <summary>
+/// <para>Performs the flush operation on one or more indices.</para>
+/// </summary>
 public sealed partial class FlushRequestDescriptor<TDocument> : RequestDescriptor<FlushRequestDescriptor<TDocument>, FlushRequestParameters>
 {
 	internal FlushRequestDescriptor(Action<FlushRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FlushRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementFlush;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementFlush;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public FlushRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public FlushRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public FlushRequestDescriptor<TDocument> Force(bool? force = true) => Qs("force", force);
 	public FlushRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public FlushRequestDescriptor<TDocument> WaitIfOngoing(bool? waitIfOngoing = true) => Qs("wait_if_ongoing", waitIfOngoing);
+
 	public FlushRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -100,21 +141,29 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Performs the flush operation on one or more indices.</para>
+/// </summary>
 public sealed partial class FlushRequestDescriptor : RequestDescriptor<FlushRequestDescriptor, FlushRequestParameters>
 {
 	internal FlushRequestDescriptor(Action<FlushRequestDescriptor> configure) => configure.Invoke(this);
+
 	public FlushRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementFlush;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementFlush;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public FlushRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public FlushRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public FlushRequestDescriptor Force(bool? force = true) => Qs("force", force);
 	public FlushRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public FlushRequestDescriptor WaitIfOngoing(bool? waitIfOngoing = true) => Qs("wait_if_ongoing", waitIfOngoing);
+
 	public FlushRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FlushResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FlushResponse.g.cs
index 238398d527a..d4a544b5051 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FlushResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/FlushResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class FlushResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("_shards")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ForcemergeRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ForcemergeRequest.g.cs
index 3e8b082c2e3..bfcc04937d9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ForcemergeRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ForcemergeRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,32 +27,49 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class ForcemergeRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether the index should be flushed after performing the operation (default: true)</para>
+	/// </summary>
 	public bool? Flush { get => Q<bool?>("flush"); set => Q("flush", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The number of segments the index should be merged into (default: dynamic)</para>
+	/// </summary>
 	public long? MaxNumSegments { get => Q<long?>("max_num_segments"); set => Q("max_num_segments", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether the operation should only expunge deleted documents</para>
+	/// </summary>
 	public bool? OnlyExpungeDeletes { get => Q<bool?>("only_expunge_deletes"); set => Q("only_expunge_deletes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Should the request wait until the force merge is completed.</para>
+	/// </summary>
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
 }
 
+/// <summary>
+/// <para>Performs the force merge operation on one or more indices.</para>
+/// </summary>
 public sealed partial class ForcemergeRequest : PlainRequest<ForcemergeRequestParameters>
 {
 	public ForcemergeRequest()
@@ -61,41 +80,72 @@ public ForcemergeRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementForcemerge;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementForcemerge;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Specify whether the index should be flushed after performing the operation (default: true)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Flush { get => Q<bool?>("flush"); set => Q("flush", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>The number of segments the index should be merged into (default: dynamic)</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? MaxNumSegments { get => Q<long?>("max_num_segments"); set => Q("max_num_segments", value); }
 
+	/// <summary>
+	/// <para>Specify whether the operation should only expunge deleted documents</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? OnlyExpungeDeletes { get => Q<bool?>("only_expunge_deletes"); set => Q("only_expunge_deletes", value); }
 
+	/// <summary>
+	/// <para>Should the request wait until the force merge is completed.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
 }
 
+/// <summary>
+/// <para>Performs the force merge operation on one or more indices.</para>
+/// </summary>
 public sealed partial class ForcemergeRequestDescriptor<TDocument> : RequestDescriptor<ForcemergeRequestDescriptor<TDocument>, ForcemergeRequestParameters>
 {
 	internal ForcemergeRequestDescriptor(Action<ForcemergeRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ForcemergeRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementForcemerge;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementForcemerge;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public ForcemergeRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public ForcemergeRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public ForcemergeRequestDescriptor<TDocument> Flush(bool? flush = true) => Qs("flush", flush);
@@ -103,6 +153,7 @@ public ForcemergeRequestDescriptor()
 	public ForcemergeRequestDescriptor<TDocument> MaxNumSegments(long? maxNumSegments) => Qs("max_num_segments", maxNumSegments);
 	public ForcemergeRequestDescriptor<TDocument> OnlyExpungeDeletes(bool? onlyExpungeDeletes = true) => Qs("only_expunge_deletes", onlyExpungeDeletes);
 	public ForcemergeRequestDescriptor<TDocument> WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
+
 	public ForcemergeRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -114,16 +165,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Performs the force merge operation on one or more indices.</para>
+/// </summary>
 public sealed partial class ForcemergeRequestDescriptor : RequestDescriptor<ForcemergeRequestDescriptor, ForcemergeRequestParameters>
 {
 	internal ForcemergeRequestDescriptor(Action<ForcemergeRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ForcemergeRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementForcemerge;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementForcemerge;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public ForcemergeRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public ForcemergeRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public ForcemergeRequestDescriptor Flush(bool? flush = true) => Qs("flush", flush);
@@ -131,6 +189,7 @@ public ForcemergeRequestDescriptor()
 	public ForcemergeRequestDescriptor MaxNumSegments(long? maxNumSegments) => Qs("max_num_segments", maxNumSegments);
 	public ForcemergeRequestDescriptor OnlyExpungeDeletes(bool? onlyExpungeDeletes = true) => Qs("only_expunge_deletes", onlyExpungeDeletes);
 	public ForcemergeRequestDescriptor WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
+
 	public ForcemergeRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ForcemergeResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ForcemergeResponse.g.cs
index f54785902bd..7bdc887d19f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ForcemergeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ForcemergeResponse.g.cs
@@ -15,19 +15,24 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ForcemergeResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
 
+	/// <summary>
+	/// <para>task contains a task id returned when wait_for_completion=false,<br/>you can use the task_id to get the status of the task at _tasks/<task_id></para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("task")]
 	public string? Task { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasRequest.g.cs
index 2c8abbb10f8..8ea7a5286c8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,23 +27,34 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class GetAliasRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 }
 
+/// <summary>
+/// <para>Returns an alias.</para>
+/// </summary>
 public sealed partial class GetAliasRequest : PlainRequest<GetAliasRequestParameters>
 {
 	public GetAliasRequest()
@@ -60,25 +73,44 @@ public GetAliasRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 }
 
+/// <summary>
+/// <para>Returns an alias.</para>
+/// </summary>
 public sealed partial class GetAliasRequestDescriptor<TDocument> : RequestDescriptor<GetAliasRequestDescriptor<TDocument>, GetAliasRequestParameters>
 {
 	internal GetAliasRequestDescriptor(Action<GetAliasRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetAliasRequestDescriptor()
 	{
 	}
@@ -91,13 +123,17 @@ public GetAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetAliasRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public GetAliasRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public GetAliasRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public GetAliasRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
+
 	public GetAliasRequestDescriptor<TDocument> Name(Elastic.Clients.Elasticsearch.Names? name)
 	{
 		RouteValues.Optional("name", name);
@@ -115,9 +151,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns an alias.</para>
+/// </summary>
 public sealed partial class GetAliasRequestDescriptor : RequestDescriptor<GetAliasRequestDescriptor, GetAliasRequestParameters>
 {
 	internal GetAliasRequestDescriptor(Action<GetAliasRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetAliasRequestDescriptor()
 	{
 	}
@@ -130,13 +170,17 @@ public GetAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetAliasRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public GetAliasRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public GetAliasRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public GetAliasRequestDescriptor Local(bool? local = true) => Qs("local", local);
+
 	public GetAliasRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names? name)
 	{
 		RouteValues.Optional("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasResponse.g.cs
index cdeadf2741f..523c2d54832 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetAliasResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class GetAliasResponse : DictionaryResponse<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.IndexAliases>
 {
 	public GetAliasResponse(IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.IndexAliases> dictionary) : base(dictionary)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamRequest.g.cs
index 40d28a11c84..0bad9d5caf8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,14 +27,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class GetDataStreamRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether wildcard expressions should get expanded to open or closed indices (default: open)</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 }
 
+/// <summary>
+/// <para>Returns data streams.</para>
+/// </summary>
 public sealed partial class GetDataStreamRequest : PlainRequest<GetDataStreamRequestParameters>
 {
 	public GetDataStreamRequest()
@@ -43,24 +50,38 @@ public GetDataStreamRequest(Elastic.Clients.Elasticsearch.DataStreamNames? name)
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetDataStream;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetDataStream;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether wildcard expressions should get expanded to open or closed indices (default: open)</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 }
 
+/// <summary>
+/// <para>Returns data streams.</para>
+/// </summary>
 public sealed partial class GetDataStreamRequestDescriptor : RequestDescriptor<GetDataStreamRequestDescriptor, GetDataStreamRequestParameters>
 {
 	internal GetDataStreamRequestDescriptor(Action<GetDataStreamRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetDataStreamRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetDataStream;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetDataStream;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetDataStreamRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
+
 	public GetDataStreamRequestDescriptor Name(Elastic.Clients.Elasticsearch.DataStreamNames? name)
 	{
 		RouteValues.Optional("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs
index 38269f35697..9e5ef9f88f6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetDataStreamResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class GetDataStreamResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("data_streams")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingRequest.g.cs
index 13377ca7e80..fccd183cc5d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,26 +27,39 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class GetFieldMappingRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether the default mapping values should be returned as well</para>
+	/// </summary>
 	public bool? IncludeDefaults { get => Q<bool?>("include_defaults"); set => Q("include_defaults", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 }
 
+/// <summary>
+/// <para>Returns mapping for one or more fields.</para>
+/// </summary>
 public sealed partial class GetFieldMappingRequest : PlainRequest<GetFieldMappingRequestParameters>
 {
 	public GetFieldMappingRequest(Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Required("fields", fields))
@@ -55,28 +70,50 @@ public GetFieldMappingRequest(Elastic.Clients.Elasticsearch.Indices? indices, El
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetFieldMapping;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetFieldMapping;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Whether the default mapping values should be returned as well</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IncludeDefaults { get => Q<bool?>("include_defaults"); set => Q("include_defaults", value); }
 
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 }
 
+/// <summary>
+/// <para>Returns mapping for one or more fields.</para>
+/// </summary>
 public sealed partial class GetFieldMappingRequestDescriptor<TDocument> : RequestDescriptor<GetFieldMappingRequestDescriptor<TDocument>, GetFieldMappingRequestParameters>
 {
 	internal GetFieldMappingRequestDescriptor(Action<GetFieldMappingRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetFieldMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Required("fields", fields))
 	{
 	}
@@ -89,14 +126,18 @@ internal GetFieldMappingRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetFieldMapping;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetFieldMapping;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetFieldMappingRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public GetFieldMappingRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public GetFieldMappingRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public GetFieldMappingRequestDescriptor<TDocument> IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults);
 	public GetFieldMappingRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
+
 	public GetFieldMappingRequestDescriptor<TDocument> Fields(Elastic.Clients.Elasticsearch.Fields fields)
 	{
 		RouteValues.Required("fields", fields);
@@ -114,9 +155,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns mapping for one or more fields.</para>
+/// </summary>
 public sealed partial class GetFieldMappingRequestDescriptor : RequestDescriptor<GetFieldMappingRequestDescriptor, GetFieldMappingRequestParameters>
 {
 	internal GetFieldMappingRequestDescriptor(Action<GetFieldMappingRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetFieldMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Fields fields) : base(r => r.Required("fields", fields))
 	{
 	}
@@ -129,14 +174,18 @@ internal GetFieldMappingRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetFieldMapping;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetFieldMapping;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetFieldMappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public GetFieldMappingRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public GetFieldMappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public GetFieldMappingRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults);
 	public GetFieldMappingRequestDescriptor Local(bool? local = true) => Qs("local", local);
+
 	public GetFieldMappingRequestDescriptor Fields(Elastic.Clients.Elasticsearch.Fields fields)
 	{
 		RouteValues.Required("fields", fields);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingResponse.g.cs
index 906bb965b78..480d5ef2f8f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetFieldMappingResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class GetFieldMappingResponse : DictionaryResponse<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.TypeFieldMappings>
 {
 	public GetFieldMappingResponse(IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.TypeFieldMappings> dictionary) : base(dictionary)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexRequest.g.cs
index 3a3384461db..3cd9c9a288f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,72 +27,122 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class GetIndexRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If false, the request returns an error if any wildcard expression, index alias, or _all value targets only<br/>missing or closed indices. This behavior applies even if the request targets other open indices. For example,<br/>a request targeting foo*,bar* returns an error if an index starts with foo but no index starts with bar.</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Type of index that wildcard expressions can match. If the request can target data streams, this argument<br/>determines whether wildcard expressions match hidden data streams. Supports comma-separated values,<br/>such as open,hidden.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, returns settings in flat format.</para>
+	/// </summary>
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If false, requests that target a missing index return an error.</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, return all default settings in the response.</para>
+	/// </summary>
 	public bool? IncludeDefaults { get => Q<bool?>("include_defaults"); set => Q("include_defaults", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, the request retrieves information from the local node only. Defaults to false, which means information is retrieved from the master node.</para>
+	/// </summary>
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return only information on specified index features</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Feature>? Features { get => Q<ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Feature>?>("features"); set => Q("features", value); }
 }
 
+/// <summary>
+/// <para>Returns information about one or more indices. For data streams, the API returns information about the<br/>stream’s backing indices.</para>
+/// </summary>
 public sealed partial class GetIndexRequest : PlainRequest<GetIndexRequestParameters>
 {
 	public GetIndexRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>If false, the request returns an error if any wildcard expression, index alias, or _all value targets only<br/>missing or closed indices. This behavior applies even if the request targets other open indices. For example,<br/>a request targeting foo*,bar* returns an error if an index starts with foo but no index starts with bar.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Type of index that wildcard expressions can match. If the request can target data streams, this argument<br/>determines whether wildcard expressions match hidden data streams. Supports comma-separated values,<br/>such as open,hidden.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>If true, returns settings in flat format.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
+	/// <summary>
+	/// <para>If false, requests that target a missing index return an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>If true, return all default settings in the response.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IncludeDefaults { get => Q<bool?>("include_defaults"); set => Q("include_defaults", value); }
 
+	/// <summary>
+	/// <para>If true, the request retrieves information from the local node only. Defaults to false, which means information is retrieved from the master node.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Return only information on specified index features</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Feature>? Features { get => Q<ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Feature>?>("features"); set => Q("features", value); }
 }
 
+/// <summary>
+/// <para>Returns information about one or more indices. For data streams, the API returns information about the<br/>stream’s backing indices.</para>
+/// </summary>
 public sealed partial class GetIndexRequestDescriptor<TDocument> : RequestDescriptor<GetIndexRequestDescriptor<TDocument>, GetIndexRequestParameters>
 {
 	internal GetIndexRequestDescriptor(Action<GetIndexRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -99,9 +151,12 @@ internal GetIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetIndexRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public GetIndexRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public GetIndexRequestDescriptor<TDocument> Features(ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Feature>? features) => Qs("features", features);
@@ -110,6 +165,7 @@ internal GetIndexRequestDescriptor()
 	public GetIndexRequestDescriptor<TDocument> IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults);
 	public GetIndexRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
 	public GetIndexRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+
 	public GetIndexRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -121,9 +177,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns information about one or more indices. For data streams, the API returns information about the<br/>stream’s backing indices.</para>
+/// </summary>
 public sealed partial class GetIndexRequestDescriptor : RequestDescriptor<GetIndexRequestDescriptor, GetIndexRequestParameters>
 {
 	internal GetIndexRequestDescriptor(Action<GetIndexRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -132,9 +192,12 @@ internal GetIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGet;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGet;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public GetIndexRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public GetIndexRequestDescriptor Features(ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Feature>? features) => Qs("features", features);
@@ -143,6 +206,7 @@ internal GetIndexRequestDescriptor()
 	public GetIndexRequestDescriptor IncludeDefaults(bool? includeDefaults = true) => Qs("include_defaults", includeDefaults);
 	public GetIndexRequestDescriptor Local(bool? local = true) => Qs("local", local);
 	public GetIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+
 	public GetIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexResponse.g.cs
index 953e39844e0..4169c622ef8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class GetIndexResponse : DictionaryResponse<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.IndexState>
 {
 	public GetIndexResponse(IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.IndexState> dictionary) : base(dictionary)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateRequest.g.cs
index 937a375b730..87d72528bba 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,20 +27,29 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class GetIndexTemplateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, the request retrieves information from the local node only. Defaults to false, which means information is retrieved from the master node.</para>
+	/// </summary>
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, returns settings in flat format.</para>
+	/// </summary>
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns information about one or more index templates.</para>
+/// </summary>
 public sealed partial class GetIndexTemplateRequest : PlainRequest<GetIndexTemplateRequestParameters>
 {
 	public GetIndexTemplateRequest()
@@ -49,32 +60,52 @@ public GetIndexTemplateRequest(Elastic.Clients.Elasticsearch.Name? name) : base(
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>If true, the request retrieves information from the local node only. Defaults to false, which means information is retrieved from the master node.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
+	/// <summary>
+	/// <para>If true, returns settings in flat format.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns information about one or more index templates.</para>
+/// </summary>
 public sealed partial class GetIndexTemplateRequestDescriptor : RequestDescriptor<GetIndexTemplateRequestDescriptor, GetIndexTemplateRequestParameters>
 {
 	internal GetIndexTemplateRequestDescriptor(Action<GetIndexTemplateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetIndexTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetIndexTemplateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 	public GetIndexTemplateRequestDescriptor Local(bool? local = true) => Qs("local", local);
 	public GetIndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+
 	public GetIndexTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name? name)
 	{
 		RouteValues.Optional("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs
index a2c2ad3ba20..8a30077c61e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetIndexTemplateResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class GetIndexTemplateResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("index_templates")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingRequest.g.cs
index 8d9ae6f4020..e671816e8b8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,26 +27,39 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class GetMappingRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns mappings for one or more indices.</para>
+/// </summary>
 public sealed partial class GetMappingRequest : PlainRequest<GetMappingRequestParameters>
 {
 	public GetMappingRequest()
@@ -55,40 +70,66 @@ public GetMappingRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetMapping;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetMapping;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns mappings for one or more indices.</para>
+/// </summary>
 public sealed partial class GetMappingRequestDescriptor<TDocument> : RequestDescriptor<GetMappingRequestDescriptor<TDocument>, GetMappingRequestParameters>
 {
 	internal GetMappingRequestDescriptor(Action<GetMappingRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetMappingRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetMapping;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetMapping;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetMappingRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public GetMappingRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public GetMappingRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public GetMappingRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
 	public GetMappingRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+
 	public GetMappingRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -100,21 +141,29 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns mappings for one or more indices.</para>
+/// </summary>
 public sealed partial class GetMappingRequestDescriptor : RequestDescriptor<GetMappingRequestDescriptor, GetMappingRequestParameters>
 {
 	internal GetMappingRequestDescriptor(Action<GetMappingRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetMappingRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetMapping;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetMapping;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetMappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public GetMappingRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public GetMappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public GetMappingRequestDescriptor Local(bool? local = true) => Qs("local", local);
 	public GetMappingRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+
 	public GetMappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingResponse.g.cs
index 221c9f45677..57626a6b897 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetMappingResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class GetMappingResponse : DictionaryResponse<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.IndexMappingRecord>
 {
 	public GetMappingResponse(IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.IndexMappingRecord> dictionary) : base(dictionary)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateRequest.g.cs
index 40c83196be9..e5c4a1d0c36 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,20 +27,29 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class GetTemplateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return settings in flat format (default: false)</para>
+	/// </summary>
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout for connection to master node</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns an index template.</para>
+/// </summary>
 public sealed partial class GetTemplateRequest : PlainRequest<GetTemplateRequestParameters>
 {
 	public GetTemplateRequest()
@@ -49,32 +60,52 @@ public GetTemplateRequest(Elastic.Clients.Elasticsearch.Names? name) : base(r =>
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Return settings in flat format (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout for connection to master node</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns an index template.</para>
+/// </summary>
 public sealed partial class GetTemplateRequestDescriptor : RequestDescriptor<GetTemplateRequestDescriptor, GetTemplateRequestParameters>
 {
 	internal GetTemplateRequestDescriptor(Action<GetTemplateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementGetTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementGetTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetTemplateRequestDescriptor FlatSettings(bool? flatSettings = true) => Qs("flat_settings", flatSettings);
 	public GetTemplateRequestDescriptor Local(bool? local = true) => Qs("local", local);
 	public GetTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+
 	public GetTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Names? name)
 	{
 		RouteValues.Optional("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateResponse.g.cs
index c5c61e1168a..403afab1c1f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/GetTemplateResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class GetTemplateResponse : DictionaryResponse<string, Elastic.Clients.Elasticsearch.IndexManagement.TemplateMapping>
 {
 	public GetTemplateResponse(IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.IndexManagement.TemplateMapping> dictionary) : base(dictionary)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsRequest.g.cs
index 699e3b0c26b..c2d79216f7a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,38 +27,59 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class IndicesStatsRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Comma-separated list or wildcard expressions of fields to include in fielddata and suggest statistics.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? CompletionFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("completion_fields"); set => Q("completion_fields", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Type of index that wildcard patterns can match. If the request can target data streams, this argument<br/>determines whether wildcard expressions match hidden data streams. Supports comma-separated values,<br/>such as `open,hidden`.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Comma-separated list or wildcard expressions of fields to include in fielddata statistics.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? FielddataFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("fielddata_fields"); set => Q("fielddata_fields", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Comma-separated list or wildcard expressions of fields to include in the statistics.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("fields"); set => Q("fields", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, statistics are not collected from closed indices.</para>
+	/// </summary>
 	public bool? ForbidClosedIndices { get => Q<bool?>("forbid_closed_indices"); set => Q("forbid_closed_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Comma-separated list of search groups to include in the search statistics.</para>
+	/// </summary>
 	public ICollection<string>? Groups { get => Q<ICollection<string>?>("groups"); set => Q("groups", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, the call reports the aggregated disk usage of each one of the Lucene index files (only applies if segment stats are requested).</para>
+	/// </summary>
 	public bool? IncludeSegmentFileSizes { get => Q<bool?>("include_segment_file_sizes"); set => Q("include_segment_file_sizes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, the response includes information from segments that are not loaded into memory.</para>
+	/// </summary>
 	public bool? IncludeUnloadedSegments { get => Q<bool?>("include_unloaded_segments"); set => Q("include_unloaded_segments", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Indicates whether statistics are aggregated at the cluster, index, or shard level.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Level? Level { get => Q<Elastic.Clients.Elasticsearch.Level?>("level"); set => Q("level", value); }
 }
 
+/// <summary>
+/// <para>Provides statistics on operations happening in an index.</para>
+/// </summary>
 public sealed partial class IndicesStatsRequest : PlainRequest<IndicesStatsRequestParameters>
 {
 	public IndicesStatsRequest()
@@ -75,40 +98,74 @@ public IndicesStatsRequest(Elastic.Clients.Elasticsearch.Indices? indices, Elast
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementStats;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementStats;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Comma-separated list or wildcard expressions of fields to include in fielddata and suggest statistics.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? CompletionFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("completion_fields"); set => Q("completion_fields", value); }
 
+	/// <summary>
+	/// <para>Type of index that wildcard patterns can match. If the request can target data streams, this argument<br/>determines whether wildcard expressions match hidden data streams. Supports comma-separated values,<br/>such as `open,hidden`.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Comma-separated list or wildcard expressions of fields to include in fielddata statistics.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? FielddataFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("fielddata_fields"); set => Q("fielddata_fields", value); }
 
+	/// <summary>
+	/// <para>Comma-separated list or wildcard expressions of fields to include in the statistics.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("fields"); set => Q("fields", value); }
 
+	/// <summary>
+	/// <para>If true, statistics are not collected from closed indices.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? ForbidClosedIndices { get => Q<bool?>("forbid_closed_indices"); set => Q("forbid_closed_indices", value); }
 
+	/// <summary>
+	/// <para>Comma-separated list of search groups to include in the search statistics.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<string>? Groups { get => Q<ICollection<string>?>("groups"); set => Q("groups", value); }
 
+	/// <summary>
+	/// <para>If true, the call reports the aggregated disk usage of each one of the Lucene index files (only applies if segment stats are requested).</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IncludeSegmentFileSizes { get => Q<bool?>("include_segment_file_sizes"); set => Q("include_segment_file_sizes", value); }
 
+	/// <summary>
+	/// <para>If true, the response includes information from segments that are not loaded into memory.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IncludeUnloadedSegments { get => Q<bool?>("include_unloaded_segments"); set => Q("include_unloaded_segments", value); }
 
+	/// <summary>
+	/// <para>Indicates whether statistics are aggregated at the cluster, index, or shard level.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Level? Level { get => Q<Elastic.Clients.Elasticsearch.Level?>("level"); set => Q("level", value); }
 }
 
+/// <summary>
+/// <para>Provides statistics on operations happening in an index.</para>
+/// </summary>
 public sealed partial class IndicesStatsRequestDescriptor<TDocument> : RequestDescriptor<IndicesStatsRequestDescriptor<TDocument>, IndicesStatsRequestParameters>
 {
 	internal IndicesStatsRequestDescriptor(Action<IndicesStatsRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IndicesStatsRequestDescriptor()
 	{
 	}
@@ -121,9 +178,12 @@ public IndicesStatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indi
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementStats;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementStats;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public IndicesStatsRequestDescriptor<TDocument> CompletionFields(Elastic.Clients.Elasticsearch.Fields? completionFields) => Qs("completion_fields", completionFields);
 	public IndicesStatsRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public IndicesStatsRequestDescriptor<TDocument> FielddataFields(Elastic.Clients.Elasticsearch.Fields? fielddataFields) => Qs("fielddata_fields", fielddataFields);
@@ -133,6 +193,7 @@ public IndicesStatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indi
 	public IndicesStatsRequestDescriptor<TDocument> IncludeSegmentFileSizes(bool? includeSegmentFileSizes = true) => Qs("include_segment_file_sizes", includeSegmentFileSizes);
 	public IndicesStatsRequestDescriptor<TDocument> IncludeUnloadedSegments(bool? includeUnloadedSegments = true) => Qs("include_unloaded_segments", includeUnloadedSegments);
 	public IndicesStatsRequestDescriptor<TDocument> Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level);
+
 	public IndicesStatsRequestDescriptor<TDocument> Metric(Elastic.Clients.Elasticsearch.Metrics? metric)
 	{
 		RouteValues.Optional("metric", metric);
@@ -150,9 +211,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Provides statistics on operations happening in an index.</para>
+/// </summary>
 public sealed partial class IndicesStatsRequestDescriptor : RequestDescriptor<IndicesStatsRequestDescriptor, IndicesStatsRequestParameters>
 {
 	internal IndicesStatsRequestDescriptor(Action<IndicesStatsRequestDescriptor> configure) => configure.Invoke(this);
+
 	public IndicesStatsRequestDescriptor()
 	{
 	}
@@ -165,9 +230,12 @@ public IndicesStatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indi
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementStats;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementStats;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public IndicesStatsRequestDescriptor CompletionFields(Elastic.Clients.Elasticsearch.Fields? completionFields) => Qs("completion_fields", completionFields);
 	public IndicesStatsRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public IndicesStatsRequestDescriptor FielddataFields(Elastic.Clients.Elasticsearch.Fields? fielddataFields) => Qs("fielddata_fields", fielddataFields);
@@ -177,6 +245,7 @@ public IndicesStatsRequestDescriptor(Elastic.Clients.Elasticsearch.Indices? indi
 	public IndicesStatsRequestDescriptor IncludeSegmentFileSizes(bool? includeSegmentFileSizes = true) => Qs("include_segment_file_sizes", includeSegmentFileSizes);
 	public IndicesStatsRequestDescriptor IncludeUnloadedSegments(bool? includeUnloadedSegments = true) => Qs("include_unloaded_segments", includeUnloadedSegments);
 	public IndicesStatsRequestDescriptor Level(Elastic.Clients.Elasticsearch.Level? level) => Qs("level", level);
+
 	public IndicesStatsRequestDescriptor Metric(Elastic.Clients.Elasticsearch.Metrics? metric)
 	{
 		RouteValues.Optional("metric", metric);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs
index 7c5520be67c..53f2fe76f3f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/IndicesStatsResponse.g.cs
@@ -15,22 +15,22 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndicesStatsResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("_all")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndicesStats All { get; init; }
-
 	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.IndexManagement.IndicesStats>? Indices { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MigrateToDataStreamRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MigrateToDataStreamRequest.g.cs
index c7634cf67f1..6f27477cc11 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MigrateToDataStreamRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MigrateToDataStreamRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,26 +27,35 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class MigrateToDataStreamRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Migrates an alias to a data stream</para>
+/// </summary>
 public sealed partial class MigrateToDataStreamRequest : PlainRequest<MigrateToDataStreamRequestParameters>
 {
 	public MigrateToDataStreamRequest(Elastic.Clients.Elasticsearch.IndexName name) : base(r => r.Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementMigrateToDataStream;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementMigrateToDataStream;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Migrates an alias to a data stream</para>
+/// </summary>
 public sealed partial class MigrateToDataStreamRequestDescriptor : RequestDescriptor<MigrateToDataStreamRequestDescriptor, MigrateToDataStreamRequestParameters>
 {
 	internal MigrateToDataStreamRequestDescriptor(Action<MigrateToDataStreamRequestDescriptor> configure) => configure.Invoke(this);
+
 	public MigrateToDataStreamRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName name) : base(r => r.Required("name", name))
 	{
 	}
@@ -53,9 +64,12 @@ internal MigrateToDataStreamRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementMigrateToDataStream;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementMigrateToDataStream;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public MigrateToDataStreamRequestDescriptor Name(Elastic.Clients.Elasticsearch.IndexName name)
 	{
 		RouteValues.Required("name", name);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MigrateToDataStreamResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MigrateToDataStreamResponse.g.cs
index 992a6f6ad6f..a367af13458 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MigrateToDataStreamResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/MigrateToDataStreamResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class MigrateToDataStreamResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexRequest.g.cs
index 9dc7e992226..99fc4abef26 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,60 +27,100 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class OpenIndexRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Sets the number of active shards to wait for before the operation returns.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Opens an index.</para>
+/// </summary>
 public sealed partial class OpenIndexRequest : PlainRequest<OpenIndexRequestParameters>
 {
 	public OpenIndexRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementOpen;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementOpen;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Sets the number of active shards to wait for before the operation returns.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Opens an index.</para>
+/// </summary>
 public sealed partial class OpenIndexRequestDescriptor<TDocument> : RequestDescriptor<OpenIndexRequestDescriptor<TDocument>, OpenIndexRequestParameters>
 {
 	internal OpenIndexRequestDescriptor(Action<OpenIndexRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public OpenIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -87,15 +129,19 @@ internal OpenIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementOpen;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementOpen;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public OpenIndexRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public OpenIndexRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public OpenIndexRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public OpenIndexRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public OpenIndexRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public OpenIndexRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public OpenIndexRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -107,9 +153,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Opens an index.</para>
+/// </summary>
 public sealed partial class OpenIndexRequestDescriptor : RequestDescriptor<OpenIndexRequestDescriptor, OpenIndexRequestParameters>
 {
 	internal OpenIndexRequestDescriptor(Action<OpenIndexRequestDescriptor> configure) => configure.Invoke(this);
+
 	public OpenIndexRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -118,15 +168,19 @@ internal OpenIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementOpen;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementOpen;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public OpenIndexRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public OpenIndexRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public OpenIndexRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public OpenIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public OpenIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public OpenIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public OpenIndexRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs
index 87b649a0f48..608a81e0998 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/OpenIndexResponse.g.cs
@@ -15,19 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class OpenIndexResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards_acknowledged")]
 	public bool ShardsAcknowledged { get; init; }
 }
\ No newline at end of file
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 426053a8373..5133598b1ef 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,51 +27,66 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class PutAliasRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit timestamp for the document</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Creates or updates an alias.</para>
+/// </summary>
 public sealed partial class PutAliasRequest : PlainRequest<PutAliasRequestParameters>
 {
 	public PutAliasRequest(Elastic.Clients.Elasticsearch.Indices indices, Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("index", indices).Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementPutAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit timestamp for the document</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
-
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_routing")]
 	public Elastic.Clients.Elasticsearch.Routing? IndexRouting { get; set; }
-
 	[JsonInclude, JsonPropertyName("is_write_index")]
 	public bool? IsWriteIndex { get; set; }
-
 	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_routing")]
 	public Elastic.Clients.Elasticsearch.Routing? SearchRouting { get; set; }
 }
 
+/// <summary>
+/// <para>Creates or updates an alias.</para>
+/// </summary>
 public sealed partial class PutAliasRequestDescriptor<TDocument> : RequestDescriptor<PutAliasRequestDescriptor<TDocument>, PutAliasRequestParameters>
 {
 	internal PutAliasRequestDescriptor(Action<PutAliasRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PutAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices, Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("index", indices).Required("name", name))
 	{
 	}
@@ -78,11 +95,15 @@ internal PutAliasRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementPutAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	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);
@@ -96,17 +117,11 @@ public PutAliasRequestDescriptor<TDocument> Name(Elastic.Clients.Elasticsearch.N
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? IndexRoutingValue { get; set; }
-
 	private bool? IsWriteIndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? SearchRoutingValue { get; set; }
 
 	public PutAliasRequestDescriptor<TDocument> Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
@@ -204,9 +219,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Creates or updates an alias.</para>
+/// </summary>
 public sealed partial class PutAliasRequestDescriptor : RequestDescriptor<PutAliasRequestDescriptor, PutAliasRequestParameters>
 {
 	internal PutAliasRequestDescriptor(Action<PutAliasRequestDescriptor> configure) => configure.Invoke(this);
+
 	public PutAliasRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices, Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("index", indices).Required("name", name))
 	{
 	}
@@ -215,11 +234,15 @@ internal PutAliasRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutAlias;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementPutAlias;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	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);
@@ -233,17 +256,11 @@ public PutAliasRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name name)
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? IndexRoutingValue { get; set; }
-
 	private bool? IsWriteIndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? SearchRoutingValue { get; set; }
 
 	public PutAliasRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasResponse.g.cs
index a11bad19f5b..65189177f9d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutAliasResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class PutAliasResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndexTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndexTemplateRequest.g.cs
index 05b8d64642e..837658f61d4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndexTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndexTemplateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,51 +27,59 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class PutIndexTemplateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether the index template should only be added if new or can also replace an existing one</para>
+	/// </summary>
 	public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
 }
 
+/// <summary>
+/// <para>Creates or updates an index template.</para>
+/// </summary>
 public sealed partial class PutIndexTemplateRequest : PlainRequest<PutIndexTemplateRequestParameters>
 {
 	public PutIndexTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementPutIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Whether the index template should only be added if new or can also replace an existing one</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
-
 	[JsonInclude, JsonPropertyName("index_patterns")]
 	public Elastic.Clients.Elasticsearch.Indices? IndexPatterns { get; set; }
-
 	[JsonInclude, JsonPropertyName("composed_of")]
 	public ICollection<Elastic.Clients.Elasticsearch.Name>? ComposedOf { get; set; }
-
 	[JsonInclude, JsonPropertyName("template")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateMapping? Template { get; set; }
-
 	[JsonInclude, JsonPropertyName("data_stream")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.DataStreamVisibility? DataStream { get; set; }
-
 	[JsonInclude, JsonPropertyName("priority")]
 	public int? Priority { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
-
 	[JsonInclude, JsonPropertyName("_meta")]
 	public IDictionary<string, object>? Meta { get; set; }
 }
 
+/// <summary>
+/// <para>Creates or updates an index template.</para>
+/// </summary>
 public sealed partial class PutIndexTemplateRequestDescriptor<TDocument> : RequestDescriptor<PutIndexTemplateRequestDescriptor<TDocument>, PutIndexTemplateRequestParameters>
 {
 	internal PutIndexTemplateRequestDescriptor(Action<PutIndexTemplateRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PutIndexTemplateRequestDescriptor(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
@@ -78,10 +88,14 @@ internal PutIndexTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementPutIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public PutIndexTemplateRequestDescriptor<TDocument> Create(bool? create = true) => Qs("create", create);
+
 	public PutIndexTemplateRequestDescriptor<TDocument> Name(Elastic.Clients.Elasticsearch.Name name)
 	{
 		RouteValues.Required("name", name);
@@ -89,25 +103,15 @@ public PutIndexTemplateRequestDescriptor<TDocument> Name(Elastic.Clients.Elastic
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateMapping? TemplateValue { get; set; }
-
 	private IndexTemplateMappingDescriptor<TDocument> TemplateDescriptor { get; set; }
-
 	private Action<IndexTemplateMappingDescriptor<TDocument>> TemplateDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Name>? ComposedOfValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.DataStreamVisibility? DataStreamValue { get; set; }
-
 	private DataStreamVisibilityDescriptor DataStreamDescriptor { get; set; }
-
 	private Action<DataStreamVisibilityDescriptor> DataStreamDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Indices? IndexPatternsValue { get; set; }
-
 	private int? PriorityValue { get; set; }
-
 	private long? VersionValue { get; set; }
 
 	public PutIndexTemplateRequestDescriptor<TDocument> Template(Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateMapping? template)
@@ -257,9 +261,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Creates or updates an index template.</para>
+/// </summary>
 public sealed partial class PutIndexTemplateRequestDescriptor : RequestDescriptor<PutIndexTemplateRequestDescriptor, PutIndexTemplateRequestParameters>
 {
 	internal PutIndexTemplateRequestDescriptor(Action<PutIndexTemplateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public PutIndexTemplateRequestDescriptor(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
@@ -268,10 +276,14 @@ internal PutIndexTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementPutIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public PutIndexTemplateRequestDescriptor Create(bool? create = true) => Qs("create", create);
+
 	public PutIndexTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name name)
 	{
 		RouteValues.Required("name", name);
@@ -279,25 +291,15 @@ public PutIndexTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateMapping? TemplateValue { get; set; }
-
 	private IndexTemplateMappingDescriptor TemplateDescriptor { get; set; }
-
 	private Action<IndexTemplateMappingDescriptor> TemplateDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Name>? ComposedOfValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.DataStreamVisibility? DataStreamValue { get; set; }
-
 	private DataStreamVisibilityDescriptor DataStreamDescriptor { get; set; }
-
 	private Action<DataStreamVisibilityDescriptor> DataStreamDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Indices? IndexPatternsValue { get; set; }
-
 	private int? PriorityValue { get; set; }
-
 	private long? VersionValue { get; set; }
 
 	public PutIndexTemplateRequestDescriptor Template(Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateMapping? template)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndexTemplateResponse.g.cs
index 1b19babf5fb..7ac4d061975 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutIndexTemplateResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class PutIndexTemplateResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
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 35db4f25aad..5cf2967ddd6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,93 +27,167 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class PutMappingRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>When true, applies mappings only to the write index of an alias or data stream</para>
+	/// </summary>
 	public bool? WriteIndexOnly { get => Q<bool?>("write_index_only"); set => Q("write_index_only", value); }
 }
 
+/// <summary>
+/// <para>Updates the index mappings.</para>
+/// </summary>
 public sealed partial class PutMappingRequest : PlainRequest<PutMappingRequestParameters>
 {
 	public PutMappingRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutMapping;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementPutMapping;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>When true, applies mappings only to the write index of an alias or data stream</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? WriteIndexOnly { get => Q<bool?>("write_index_only"); set => Q("write_index_only", value); }
 
+	/// <summary>
+	/// <para>Controls whether dynamic date detection is enabled.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("date_detection")]
 	public bool? DateDetection { get; set; }
 
+	/// <summary>
+	/// <para>Controls whether new fields are added dynamically.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
 
+	/// <summary>
+	/// <para>If date detection is enabled then new string fields are checked<br/>against 'dynamic_date_formats' and if the value matches then<br/>a new date field is added instead of string.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("dynamic_date_formats")]
 	public ICollection<string>? DynamicDateFormats { get; set; }
 
+	/// <summary>
+	/// <para>Specify dynamic templates for the mapping.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("dynamic_templates"), SingleOrManyCollectionConverter(typeof(IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>))]
 	public ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>? DynamicTemplates { get; set; }
 
+	/// <summary>
+	/// <para>Control whether field names are enabled for the index.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_field_names")]
 	public Elastic.Clients.Elasticsearch.Mapping.FieldNamesField? FieldNames { get; set; }
 
+	/// <summary>
+	/// <para>A mapping type can have custom meta data associated with it. These are<br/>not used at all by Elasticsearch, but can be used to store<br/>application-specific metadata.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_meta")]
 	public IDictionary<string, object>? Meta { get; set; }
 
+	/// <summary>
+	/// <para>Automatically map strings into numeric data types for all fields.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("numeric_detection")]
 	public bool? NumericDetection { get; set; }
 
+	/// <summary>
+	/// <para>Mapping for a field. For new fields, this mapping can include:</para>
+	/// <para>- Field name<br/>- Field data type<br/>- Mapping parameters</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
 
+	/// <summary>
+	/// <para>Enable making a routing value required on indexed documents.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_routing")]
 	public Elastic.Clients.Elasticsearch.Mapping.RoutingField? Routing { get; set; }
 
+	/// <summary>
+	/// <para>Control whether the _source field is enabled on the index.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Mapping.SourceField? Source { get; set; }
 
+	/// <summary>
+	/// <para>Mapping of runtime fields for the index.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("runtime")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? Runtime { get; set; }
 }
 
+/// <summary>
+/// <para>Updates the index mappings.</para>
+/// </summary>
 public sealed partial class PutMappingRequestDescriptor<TDocument> : RequestDescriptor<PutMappingRequestDescriptor<TDocument>, PutMappingRequestParameters>
 {
 	internal PutMappingRequestDescriptor(Action<PutMappingRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PutMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -120,15 +196,19 @@ internal PutMappingRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutMapping;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementPutMapping;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public PutMappingRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public PutMappingRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public PutMappingRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	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)
 	{
 		RouteValues.Required("index", indices);
@@ -136,39 +216,26 @@ public PutMappingRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsea
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.FieldNamesField? FieldNamesValue { get; set; }
-
 	private Mapping.FieldNamesFieldDescriptor FieldNamesDescriptor { get; set; }
-
 	private Action<Mapping.FieldNamesFieldDescriptor> FieldNamesDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.RoutingField? RoutingValue { get; set; }
-
 	private Mapping.RoutingFieldDescriptor RoutingDescriptor { get; set; }
-
 	private Action<Mapping.RoutingFieldDescriptor> RoutingDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.SourceField? SourceValue { get; set; }
-
 	private Mapping.SourceFieldDescriptor SourceDescriptor { get; set; }
-
 	private Action<Mapping.SourceFieldDescriptor> SourceDescriptorAction { get; set; }
-
 	private bool? DateDetectionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private ICollection<string>? DynamicDateFormatsValue { get; set; }
-
 	private ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>? DynamicTemplatesValue { get; set; }
-
 	private bool? NumericDetectionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeValue { get; set; }
 
+	/// <summary>
+	/// <para>Control whether field names are enabled for the index.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> FieldNames(Elastic.Clients.Elasticsearch.Mapping.FieldNamesField? fieldNames)
 	{
 		FieldNamesDescriptor = null;
@@ -193,12 +260,18 @@ public PutMappingRequestDescriptor<TDocument> FieldNames(Action<Mapping.FieldNam
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>A mapping type can have custom meta data associated with it. These are<br/>not used at all by Elasticsearch, but can be used to store<br/>application-specific metadata.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		MetaValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Enable making a routing value required on indexed documents.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Mapping.RoutingField? routing)
 	{
 		RoutingDescriptor = null;
@@ -223,6 +296,9 @@ public PutMappingRequestDescriptor<TDocument> Routing(Action<Mapping.RoutingFiel
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Control whether the _source field is enabled on the index.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Mapping.SourceField? source)
 	{
 		SourceDescriptor = null;
@@ -247,48 +323,75 @@ public PutMappingRequestDescriptor<TDocument> Source(Action<Mapping.SourceFieldD
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Controls whether dynamic date detection is enabled.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> DateDetection(bool? dateDetection = true)
 	{
 		DateDetectionValue = dateDetection;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Controls whether new fields are added dynamically.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
 	{
 		DynamicValue = dynamic;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If date detection is enabled then new string fields are checked<br/>against 'dynamic_date_formats' and if the value matches then<br/>a new date field is added instead of string.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> DynamicDateFormats(ICollection<string>? dynamicDateFormats)
 	{
 		DynamicDateFormatsValue = dynamicDateFormats;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specify dynamic templates for the mapping.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> DynamicTemplates(ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>? dynamicTemplates)
 	{
 		DynamicTemplatesValue = dynamicTemplates;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Automatically map strings into numeric data types for all fields.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> NumericDetection(bool? numericDetection = true)
 	{
 		NumericDetectionValue = numericDetection;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Mapping for a field. For new fields, this mapping can include:</para>
+	/// <para>- Field name<br/>- Field data type<br/>- Mapping parameters</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> Properties(Elastic.Clients.Elasticsearch.Mapping.Properties? properties)
 	{
 		PropertiesValue = properties;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Mapping for a field. For new fields, this mapping can include:</para>
+	/// <para>- Field name<br/>- Field data type<br/>- Mapping parameters</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> Properties(Mapping.PropertiesDescriptor<TDocument> descriptor)
 	{
 		PropertiesValue = descriptor.PromisedValue;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Mapping for a field. For new fields, this mapping can include:</para>
+	/// <para>- Field name<br/>- Field data type<br/>- Mapping parameters</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> Properties(Action<Mapping.PropertiesDescriptor<TDocument>> configure)
 	{
 		var descriptor = new Mapping.PropertiesDescriptor<TDocument>();
@@ -297,6 +400,9 @@ public PutMappingRequestDescriptor<TDocument> Properties(Action<Mapping.Properti
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Mapping of runtime fields for the index.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor<TDocument> Runtime(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
@@ -406,9 +512,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Updates the index mappings.</para>
+/// </summary>
 public sealed partial class PutMappingRequestDescriptor : RequestDescriptor<PutMappingRequestDescriptor, PutMappingRequestParameters>
 {
 	internal PutMappingRequestDescriptor(Action<PutMappingRequestDescriptor> configure) => configure.Invoke(this);
+
 	public PutMappingRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -417,15 +527,19 @@ internal PutMappingRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutMapping;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementPutMapping;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public PutMappingRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public PutMappingRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public PutMappingRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	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)
 	{
 		RouteValues.Required("index", indices);
@@ -433,39 +547,26 @@ public PutMappingRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.FieldNamesField? FieldNamesValue { get; set; }
-
 	private Mapping.FieldNamesFieldDescriptor FieldNamesDescriptor { get; set; }
-
 	private Action<Mapping.FieldNamesFieldDescriptor> FieldNamesDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.RoutingField? RoutingValue { get; set; }
-
 	private Mapping.RoutingFieldDescriptor RoutingDescriptor { get; set; }
-
 	private Action<Mapping.RoutingFieldDescriptor> RoutingDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.SourceField? SourceValue { get; set; }
-
 	private Mapping.SourceFieldDescriptor SourceDescriptor { get; set; }
-
 	private Action<Mapping.SourceFieldDescriptor> SourceDescriptorAction { get; set; }
-
 	private bool? DateDetectionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private ICollection<string>? DynamicDateFormatsValue { get; set; }
-
 	private ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>? DynamicTemplatesValue { get; set; }
-
 	private bool? NumericDetectionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeValue { get; set; }
 
+	/// <summary>
+	/// <para>Control whether field names are enabled for the index.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor FieldNames(Elastic.Clients.Elasticsearch.Mapping.FieldNamesField? fieldNames)
 	{
 		FieldNamesDescriptor = null;
@@ -490,12 +591,18 @@ public PutMappingRequestDescriptor FieldNames(Action<Mapping.FieldNamesFieldDesc
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>A mapping type can have custom meta data associated with it. These are<br/>not used at all by Elasticsearch, but can be used to store<br/>application-specific metadata.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		MetaValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Enable making a routing value required on indexed documents.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Mapping.RoutingField? routing)
 	{
 		RoutingDescriptor = null;
@@ -520,6 +627,9 @@ public PutMappingRequestDescriptor Routing(Action<Mapping.RoutingFieldDescriptor
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Control whether the _source field is enabled on the index.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor Source(Elastic.Clients.Elasticsearch.Mapping.SourceField? source)
 	{
 		SourceDescriptor = null;
@@ -544,48 +654,75 @@ public PutMappingRequestDescriptor Source(Action<Mapping.SourceFieldDescriptor>
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Controls whether dynamic date detection is enabled.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor DateDetection(bool? dateDetection = true)
 	{
 		DateDetectionValue = dateDetection;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Controls whether new fields are added dynamically.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
 	{
 		DynamicValue = dynamic;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If date detection is enabled then new string fields are checked<br/>against 'dynamic_date_formats' and if the value matches then<br/>a new date field is added instead of string.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor DynamicDateFormats(ICollection<string>? dynamicDateFormats)
 	{
 		DynamicDateFormatsValue = dynamicDateFormats;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specify dynamic templates for the mapping.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor DynamicTemplates(ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>? dynamicTemplates)
 	{
 		DynamicTemplatesValue = dynamicTemplates;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Automatically map strings into numeric data types for all fields.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor NumericDetection(bool? numericDetection = true)
 	{
 		NumericDetectionValue = numericDetection;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Mapping for a field. For new fields, this mapping can include:</para>
+	/// <para>- Field name<br/>- Field data type<br/>- Mapping parameters</para>
+	/// </summary>
 	public PutMappingRequestDescriptor Properties(Elastic.Clients.Elasticsearch.Mapping.Properties? properties)
 	{
 		PropertiesValue = properties;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Mapping for a field. For new fields, this mapping can include:</para>
+	/// <para>- Field name<br/>- Field data type<br/>- Mapping parameters</para>
+	/// </summary>
 	public PutMappingRequestDescriptor Properties<TDocument>(Mapping.PropertiesDescriptor<TDocument> descriptor)
 	{
 		PropertiesValue = descriptor.PromisedValue;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Mapping for a field. For new fields, this mapping can include:</para>
+	/// <para>- Field name<br/>- Field data type<br/>- Mapping parameters</para>
+	/// </summary>
 	public PutMappingRequestDescriptor Properties<TDocument>(Action<Mapping.PropertiesDescriptor<TDocument>> configure)
 	{
 		var descriptor = new Mapping.PropertiesDescriptor<TDocument>();
@@ -594,6 +731,9 @@ public PutMappingRequestDescriptor Properties<TDocument>(Action<Mapping.Properti
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Mapping of runtime fields for the index.</para>
+	/// </summary>
 	public PutMappingRequestDescriptor Runtime(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingResponse.g.cs
index 885f2862028..423ac7313cf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutMappingResponse.g.cs
@@ -15,19 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class PutMappingResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics? Shards { get; init; }
 }
\ No newline at end of file
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 d7fc43d967a..f76a2c9810c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,66 +27,99 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class PutTemplateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, this request cannot replace or update existing index templates.</para>
+	/// </summary>
 	public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
-
-	[JsonIgnore]
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is<br/>received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	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); }
 }
 
+/// <summary>
+/// <para>Creates or updates an index template.</para>
+/// </summary>
 public sealed partial class PutTemplateRequest : PlainRequest<PutTemplateRequestParameters>
 {
 	public PutTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementPutTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>If true, this request cannot replace or update existing index templates.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
-
 	[JsonIgnore]
 	public bool? FlatSettings { get => Q<bool?>("flat_settings"); set => Q("flat_settings", value); }
 
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is<br/>received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	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); }
 
+	/// <summary>
+	/// <para>Aliases for the index.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("aliases")]
 	public IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? Aliases { get; set; }
 
+	/// <summary>
+	/// <para>Array of wildcard expressions used to match the names<br/>of indices during creation.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("index_patterns"), SingleOrManyCollectionConverter(typeof(string))]
 	public ICollection<string>? IndexPatterns { get; set; }
 
+	/// <summary>
+	/// <para>Mapping for fields in the index.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping? Mappings { get; set; }
 
+	/// <summary>
+	/// <para>Order in which Elasticsearch applies this template if index<br/>matches multiple templates.</para>
+	/// <para>Templates with lower 'order' values are merged first. Templates with higher<br/>'order' values are merged later, overriding templates with lower values.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("order")]
 	public int? Order { get; set; }
 
+	/// <summary>
+	/// <para>Configuration options for the index.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("settings")]
 	public IDictionary<string, object>? Settings { get; set; }
 
+	/// <summary>
+	/// <para>Version number used to manage index templates externally. This number<br/>is not automatically generated by Elasticsearch.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
 }
 
+/// <summary>
+/// <para>Creates or updates an index template.</para>
+/// </summary>
 public sealed partial class PutTemplateRequestDescriptor : RequestDescriptor<PutTemplateRequestDescriptor, PutTemplateRequestParameters>
 {
 	internal PutTemplateRequestDescriptor(Action<PutTemplateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public PutTemplateRequestDescriptor(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
@@ -93,13 +128,17 @@ internal PutTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementPutTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementPutTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal 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.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);
@@ -107,33 +146,35 @@ public PutTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name name
 	}
 
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
-
 	private ICollection<string>? IndexPatternsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TypeMapping? MappingsValue { get; set; }
-
 	private Mapping.TypeMappingDescriptor MappingsDescriptor { get; set; }
-
 	private Action<Mapping.TypeMappingDescriptor> MappingsDescriptorAction { get; set; }
-
 	private int? OrderValue { get; set; }
-
 	private IDictionary<string, object>? SettingsValue { get; set; }
-
 	private long? VersionValue { get; set; }
 
+	/// <summary>
+	/// <para>Aliases for the index.</para>
+	/// </summary>
 	public PutTemplateRequestDescriptor Aliases(Func<FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>, FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>> selector)
 	{
 		AliasesValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard expressions used to match the names<br/>of indices during creation.</para>
+	/// </summary>
 	public PutTemplateRequestDescriptor IndexPatterns(ICollection<string>? indexPatterns)
 	{
 		IndexPatternsValue = indexPatterns;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Mapping for fields in the index.</para>
+	/// </summary>
 	public PutTemplateRequestDescriptor Mappings(Elastic.Clients.Elasticsearch.Mapping.TypeMapping? mappings)
 	{
 		MappingsDescriptor = null;
@@ -158,18 +199,28 @@ public PutTemplateRequestDescriptor Mappings(Action<Mapping.TypeMappingDescripto
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Order in which Elasticsearch applies this template if index<br/>matches multiple templates.</para>
+	/// <para>Templates with lower 'order' values are merged first. Templates with higher<br/>'order' values are merged later, overriding templates with lower values.</para>
+	/// </summary>
 	public PutTemplateRequestDescriptor Order(int? order)
 	{
 		OrderValue = order;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Configuration options for the index.</para>
+	/// </summary>
 	public PutTemplateRequestDescriptor Settings(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		SettingsValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Version number used to manage index templates externally. This number<br/>is not automatically generated by Elasticsearch.</para>
+	/// </summary>
 	public PutTemplateRequestDescriptor Version(long? version)
 	{
 		VersionValue = version;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateResponse.g.cs
index 89f641531e2..00739aff16e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/PutTemplateResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class PutTemplateResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RefreshRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RefreshRequest.g.cs
index 6ac56f91841..a36c5e85f75 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RefreshRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RefreshRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,20 +27,29 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class RefreshRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 }
 
+/// <summary>
+/// <para>Performs the refresh operation in one or more indices.</para>
+/// </summary>
 public sealed partial class RefreshRequest : PlainRequest<RefreshRequestParameters>
 {
 	public RefreshRequest()
@@ -49,32 +60,52 @@ public RefreshRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementRefresh;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementRefresh;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 }
 
+/// <summary>
+/// <para>Performs the refresh operation in one or more indices.</para>
+/// </summary>
 public sealed partial class RefreshRequestDescriptor<TDocument> : RequestDescriptor<RefreshRequestDescriptor<TDocument>, RefreshRequestParameters>
 {
 	internal RefreshRequestDescriptor(Action<RefreshRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RefreshRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementRefresh;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementRefresh;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public RefreshRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public RefreshRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public RefreshRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
+
 	public RefreshRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -86,19 +117,27 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Performs the refresh operation in one or more indices.</para>
+/// </summary>
 public sealed partial class RefreshRequestDescriptor : RequestDescriptor<RefreshRequestDescriptor, RefreshRequestParameters>
 {
 	internal RefreshRequestDescriptor(Action<RefreshRequestDescriptor> configure) => configure.Invoke(this);
+
 	public RefreshRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementRefresh;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementRefresh;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public RefreshRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public RefreshRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public RefreshRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
+
 	public RefreshRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RefreshResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RefreshResponse.g.cs
index 26e0f9db568..25716c86fdf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RefreshResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RefreshResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class RefreshResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("_shards")]
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 88fdb37b320..97b9341f7c0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,23 +27,34 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class RolloverRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If set to true the rollover action will only be validated but not actually performed even if a condition matches. The default is false</para>
+	/// </summary>
 	public bool? DryRun { get => Q<bool?>("dry_run"); set => Q("dry_run", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Set the number of active shards to wait for on the newly created rollover index before the operation returns.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Updates an alias to point to a new index when the existing index<br/>is considered to be too large or too old.</para>
+/// </summary>
 public sealed partial class RolloverRequest : PlainRequest<RolloverRequestParameters>
 {
 	public RolloverRequest(Elastic.Clients.Elasticsearch.IndexAlias alias) : base(r => r.Required("alias", alias))
@@ -52,37 +65,52 @@ public RolloverRequest(Elastic.Clients.Elasticsearch.IndexAlias alias, Elastic.C
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementRollover;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementRollover;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>If set to true the rollover action will only be validated but not actually performed even if a condition matches. The default is false</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? DryRun { get => Q<bool?>("dry_run"); set => Q("dry_run", value); }
 
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Set the number of active shards to wait for on the newly created rollover index before the operation returns.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
-
 	[JsonInclude, JsonPropertyName("aliases")]
 	public IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? Aliases { get; set; }
-
 	[JsonInclude, JsonPropertyName("conditions")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.RolloverConditions? Conditions { get; set; }
-
 	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping? Mappings { get; set; }
-
 	[JsonInclude, JsonPropertyName("settings")]
 	public IDictionary<string, object>? Settings { get; set; }
 }
 
+/// <summary>
+/// <para>Updates an alias to point to a new index when the existing index<br/>is considered to be too large or too old.</para>
+/// </summary>
 public sealed partial class RolloverRequestDescriptor : RequestDescriptor<RolloverRequestDescriptor, RolloverRequestParameters>
 {
 	internal RolloverRequestDescriptor(Action<RolloverRequestDescriptor> configure) => configure.Invoke(this);
+
 	public RolloverRequestDescriptor(Elastic.Clients.Elasticsearch.IndexAlias alias) : base(r => r.Required("alias", alias))
 	{
 	}
@@ -95,13 +123,17 @@ internal RolloverRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementRollover;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementRollover;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public RolloverRequestDescriptor DryRun(bool? dryRun = true) => Qs("dry_run", dryRun);
 	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)
 	{
 		RouteValues.Required("alias", alias);
@@ -115,19 +147,12 @@ public RolloverRequestDescriptor NewIndex(Elastic.Clients.Elasticsearch.IndexNam
 	}
 
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.RolloverConditions? ConditionsValue { get; set; }
-
 	private RolloverConditionsDescriptor ConditionsDescriptor { get; set; }
-
 	private Action<RolloverConditionsDescriptor> ConditionsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TypeMapping? MappingsValue { get; set; }
-
 	private Mapping.TypeMappingDescriptor MappingsDescriptor { get; set; }
-
 	private Action<Mapping.TypeMappingDescriptor> MappingsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? SettingsValue { get; set; }
 
 	public RolloverRequestDescriptor Aliases(Func<FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>, FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>> selector)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverResponse.g.cs
index 29e3e77c6dd..ef11d68a3ba 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/RolloverResponse.g.cs
@@ -15,34 +15,30 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class RolloverResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-
 	[JsonInclude, JsonPropertyName("conditions")]
 	public IReadOnlyDictionary<string, bool> Conditions { get; init; }
-
 	[JsonInclude, JsonPropertyName("dry_run")]
 	public bool DryRun { get; init; }
-
 	[JsonInclude, JsonPropertyName("new_index")]
 	public string NewIndex { get; init; }
-
 	[JsonInclude, JsonPropertyName("old_index")]
 	public string OldIndex { get; init; }
-
 	[JsonInclude, JsonPropertyName("rolled_over")]
 	public bool RolledOver { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards_acknowledged")]
 	public bool ShardsAcknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexRequest.g.cs
index 9c5e14aaa19..9d723e43b27 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,48 +27,71 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class ShrinkIndexRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Set the number of active shards to wait for on the shrunken index before the operation returns.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Allow to shrink an existing index into a new index with fewer primary shards.</para>
+/// </summary>
 public sealed partial class ShrinkIndexRequest : PlainRequest<ShrinkIndexRequestParameters>
 {
 	public ShrinkIndexRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementShrink;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementShrink;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Set the number of active shards to wait for on the shrunken index before the operation returns.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
-
 	[JsonInclude, JsonPropertyName("aliases")]
 	public IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? Aliases { get; set; }
-
 	[JsonInclude, JsonPropertyName("settings")]
 	public IDictionary<string, object>? Settings { get; set; }
 }
 
+/// <summary>
+/// <para>Allow to shrink an existing index into a new index with fewer primary shards.</para>
+/// </summary>
 public sealed partial class ShrinkIndexRequestDescriptor<TDocument> : RequestDescriptor<ShrinkIndexRequestDescriptor<TDocument>, ShrinkIndexRequestParameters>
 {
 	internal ShrinkIndexRequestDescriptor(Action<ShrinkIndexRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ShrinkIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target))
 	{
 	}
@@ -75,12 +100,16 @@ internal ShrinkIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementShrink;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementShrink;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public ShrinkIndexRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public ShrinkIndexRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public ShrinkIndexRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public ShrinkIndexRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName index)
 	{
 		RouteValues.Required("index", index);
@@ -94,7 +123,6 @@ public ShrinkIndexRequestDescriptor<TDocument> Target(Elastic.Clients.Elasticsea
 	}
 
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
-
 	private IDictionary<string, object>? SettingsValue { get; set; }
 
 	public ShrinkIndexRequestDescriptor<TDocument> Aliases(Func<FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>, FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>> selector)
@@ -128,9 +156,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Allow to shrink an existing index into a new index with fewer primary shards.</para>
+/// </summary>
 public sealed partial class ShrinkIndexRequestDescriptor : RequestDescriptor<ShrinkIndexRequestDescriptor, ShrinkIndexRequestParameters>
 {
 	internal ShrinkIndexRequestDescriptor(Action<ShrinkIndexRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ShrinkIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target))
 	{
 	}
@@ -139,12 +171,16 @@ internal ShrinkIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementShrink;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementShrink;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public ShrinkIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public ShrinkIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public ShrinkIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public ShrinkIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
 	{
 		RouteValues.Required("index", index);
@@ -158,7 +194,6 @@ public ShrinkIndexRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexNa
 	}
 
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
-
 	private IDictionary<string, object>? SettingsValue { get; set; }
 
 	public ShrinkIndexRequestDescriptor Aliases(Func<FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>, FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>> selector)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexResponse.g.cs
index eef945074ba..722cb06ef05 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/ShrinkIndexResponse.g.cs
@@ -15,22 +15,22 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ShrinkIndexResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards_acknowledged")]
 	public bool ShardsAcknowledged { get; init; }
 }
\ No newline at end of file
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 02601ccf756..24c789a2084 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,60 +27,72 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class SimulateIndexTemplateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If `true`, the template passed in the body is only used if no existing<br/>templates match the same index patterns. If `false`, the simulation uses<br/>the template with the highest priority. Note that the template is not<br/>permanently added or updated in either case; it is only used for the<br/>simulation.</para>
+	/// </summary>
 	public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received<br/>before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Simulate matching the given index name against the index templates in the system</para>
+/// </summary>
 public sealed partial class SimulateIndexTemplateRequest : PlainRequest<SimulateIndexTemplateRequestParameters>
 {
 	public SimulateIndexTemplateRequest(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSimulateIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementSimulateIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>If `true`, the template passed in the body is only used if no existing<br/>templates match the same index patterns. If `false`, the simulation uses<br/>the template with the highest priority. Note that the template is not<br/>permanently added or updated in either case; it is only used for the<br/>simulation.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
 
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received<br/>before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
-
 	[JsonInclude, JsonPropertyName("allow_auto_create")]
 	public bool? AllowAutoCreate { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_patterns")]
 	public Elastic.Clients.Elasticsearch.Indices? IndexPatterns { get; set; }
-
 	[JsonInclude, JsonPropertyName("composed_of")]
 	public ICollection<string>? ComposedOf { get; set; }
-
 	[JsonInclude, JsonPropertyName("template")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateMapping? Template { get; set; }
-
 	[JsonInclude, JsonPropertyName("data_stream")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.DataStreamVisibility? DataStream { get; set; }
-
 	[JsonInclude, JsonPropertyName("priority")]
 	public int? Priority { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
-
 	[JsonInclude, JsonPropertyName("_meta")]
 	public IDictionary<string, object>? Meta { get; set; }
 }
 
+/// <summary>
+/// <para>Simulate matching the given index name against the index templates in the system</para>
+/// </summary>
 public sealed partial class SimulateIndexTemplateRequestDescriptor<TDocument> : RequestDescriptor<SimulateIndexTemplateRequestDescriptor<TDocument>, SimulateIndexTemplateRequestParameters>
 {
 	internal SimulateIndexTemplateRequestDescriptor(Action<SimulateIndexTemplateRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SimulateIndexTemplateRequestDescriptor(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
@@ -87,11 +101,15 @@ internal SimulateIndexTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSimulateIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementSimulateIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public SimulateIndexTemplateRequestDescriptor<TDocument> Create(bool? create = true) => Qs("create", create);
 	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);
@@ -99,27 +117,16 @@ public SimulateIndexTemplateRequestDescriptor<TDocument> Name(Elastic.Clients.El
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateMapping? TemplateValue { get; set; }
-
 	private IndexTemplateMappingDescriptor<TDocument> TemplateDescriptor { get; set; }
-
 	private Action<IndexTemplateMappingDescriptor<TDocument>> TemplateDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private bool? AllowAutoCreateValue { get; set; }
-
 	private ICollection<string>? ComposedOfValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.DataStreamVisibility? DataStreamValue { get; set; }
-
 	private DataStreamVisibilityDescriptor DataStreamDescriptor { get; set; }
-
 	private Action<DataStreamVisibilityDescriptor> DataStreamDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Indices? IndexPatternsValue { get; set; }
-
 	private int? PriorityValue { get; set; }
-
 	private long? VersionValue { get; set; }
 
 	public SimulateIndexTemplateRequestDescriptor<TDocument> Template(Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateMapping? template)
@@ -281,9 +288,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Simulate matching the given index name against the index templates in the system</para>
+/// </summary>
 public sealed partial class SimulateIndexTemplateRequestDescriptor : RequestDescriptor<SimulateIndexTemplateRequestDescriptor, SimulateIndexTemplateRequestParameters>
 {
 	internal SimulateIndexTemplateRequestDescriptor(Action<SimulateIndexTemplateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public SimulateIndexTemplateRequestDescriptor(Elastic.Clients.Elasticsearch.Name name) : base(r => r.Required("name", name))
 	{
 	}
@@ -292,11 +303,15 @@ internal SimulateIndexTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSimulateIndexTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementSimulateIndexTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public SimulateIndexTemplateRequestDescriptor Create(bool? create = true) => Qs("create", create);
 	public SimulateIndexTemplateRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
+
 	public SimulateIndexTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch.Name name)
 	{
 		RouteValues.Required("name", name);
@@ -304,27 +319,16 @@ public SimulateIndexTemplateRequestDescriptor Name(Elastic.Clients.Elasticsearch
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateMapping? TemplateValue { get; set; }
-
 	private IndexTemplateMappingDescriptor TemplateDescriptor { get; set; }
-
 	private Action<IndexTemplateMappingDescriptor> TemplateDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private bool? AllowAutoCreateValue { get; set; }
-
 	private ICollection<string>? ComposedOfValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.DataStreamVisibility? DataStreamValue { get; set; }
-
 	private DataStreamVisibilityDescriptor DataStreamDescriptor { get; set; }
-
 	private Action<DataStreamVisibilityDescriptor> DataStreamDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Indices? IndexPatternsValue { get; set; }
-
 	private int? PriorityValue { get; set; }
-
 	private long? VersionValue { get; set; }
 
 	public SimulateIndexTemplateRequestDescriptor Template(Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateMapping? template)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateResponse.g.cs
index fbb94bd5fbc..e08148abe69 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateIndexTemplateResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SimulateIndexTemplateResponse : ElasticsearchResponse
 {
 }
\ No newline at end of file
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 a83564dcb00..6f2063ec4bf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,17 +27,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class SimulateTemplateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, the template passed in the body is only used if no existing templates match the same index patterns. If false, the simulation uses the template with the highest priority. Note that the template is not permanently added or updated in either case; it is only used for the simulation.</para>
+	/// </summary>
 	public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns the index configuration that would be applied by a particular index template.</para>
+/// </summary>
 public sealed partial class SimulateTemplateRequest : PlainRequest<SimulateTemplateRequestParameters>
 {
 	public SimulateTemplateRequest()
@@ -46,28 +55,45 @@ public SimulateTemplateRequest(Elastic.Clients.Elasticsearch.Name? name) : base(
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSimulateTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementSimulateTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>If true, the template passed in the body is only used if no existing templates match the same index patterns. If false, the simulation uses the template with the highest priority. Note that the template is not permanently added or updated in either case; it is only used for the simulation.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Create { get => Q<bool?>("create"); set => Q("create", value); }
 
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns the index configuration that would be applied by a particular index template.</para>
+/// </summary>
 public sealed partial class SimulateTemplateRequestDescriptor : RequestDescriptor<SimulateTemplateRequestDescriptor, SimulateTemplateRequestParameters>
 {
 	internal SimulateTemplateRequestDescriptor(Action<SimulateTemplateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public SimulateTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSimulateTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementSimulateTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public SimulateTemplateRequestDescriptor Create(bool? create = true) => Qs("create", create);
 	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/SimulateTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateResponse.g.cs
index 6ce9dcae045..c4992934ecc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SimulateTemplateResponse.g.cs
@@ -15,19 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SimulateTemplateResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("overlapping")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.Overlapping>? Overlapping { get; init; }
-
 	[JsonInclude, JsonPropertyName("template")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.Template Template { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexRequest.g.cs
index 98aee798333..f2a0a471509 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,48 +27,71 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class SplitIndexRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Set the number of active shards to wait for on the shrunken index before the operation returns.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 }
 
+/// <summary>
+/// <para>Allows you to split an existing index into a new index with more primary shards.</para>
+/// </summary>
 public sealed partial class SplitIndexRequest : PlainRequest<SplitIndexRequestParameters>
 {
 	public SplitIndexRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSplit;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementSplit;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Set the number of active shards to wait for on the shrunken index before the operation returns.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
-
 	[JsonInclude, JsonPropertyName("aliases")]
 	public IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? Aliases { get; set; }
-
 	[JsonInclude, JsonPropertyName("settings")]
 	public IDictionary<string, object>? Settings { get; set; }
 }
 
+/// <summary>
+/// <para>Allows you to split an existing index into a new index with more primary shards.</para>
+/// </summary>
 public sealed partial class SplitIndexRequestDescriptor<TDocument> : RequestDescriptor<SplitIndexRequestDescriptor<TDocument>, SplitIndexRequestParameters>
 {
 	internal SplitIndexRequestDescriptor(Action<SplitIndexRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SplitIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target))
 	{
 	}
@@ -75,12 +100,16 @@ internal SplitIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSplit;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementSplit;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public SplitIndexRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public SplitIndexRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public SplitIndexRequestDescriptor<TDocument> WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public SplitIndexRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName index)
 	{
 		RouteValues.Required("index", index);
@@ -94,7 +123,6 @@ public SplitIndexRequestDescriptor<TDocument> Target(Elastic.Clients.Elasticsear
 	}
 
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
-
 	private IDictionary<string, object>? SettingsValue { get; set; }
 
 	public SplitIndexRequestDescriptor<TDocument> Aliases(Func<FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>, FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>> selector)
@@ -128,9 +156,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Allows you to split an existing index into a new index with more primary shards.</para>
+/// </summary>
 public sealed partial class SplitIndexRequestDescriptor : RequestDescriptor<SplitIndexRequestDescriptor, SplitIndexRequestParameters>
 {
 	internal SplitIndexRequestDescriptor(Action<SplitIndexRequestDescriptor> configure) => configure.Invoke(this);
+
 	public SplitIndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.IndexName target) : base(r => r.Required("index", index).Required("target", target))
 	{
 	}
@@ -139,12 +171,16 @@ internal SplitIndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementSplit;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementSplit;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public SplitIndexRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public SplitIndexRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
 	public SplitIndexRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
+
 	public SplitIndexRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
 	{
 		RouteValues.Required("index", index);
@@ -158,7 +194,6 @@ public SplitIndexRequestDescriptor Target(Elastic.Clients.Elasticsearch.IndexNam
 	}
 
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
-
 	private IDictionary<string, object>? SettingsValue { get; set; }
 
 	public SplitIndexRequestDescriptor Aliases(Func<FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>, FluentDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>> selector)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexResponse.g.cs
index b62f0cc15ef..c26b0812690 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/SplitIndexResponse.g.cs
@@ -15,22 +15,22 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SplitIndexResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards_acknowledged")]
 	public bool ShardsAcknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/UpdateAliasesRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/UpdateAliasesRequest.g.cs
index 667cd8f233a..ca7a803c217 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/UpdateAliasesRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/UpdateAliasesRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,50 +27,70 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed class UpdateAliasesRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Request timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Updates index aliases.</para>
+/// </summary>
 public sealed partial class UpdateAliasesRequest : PlainRequest<UpdateAliasesRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementUpdateAliases;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementUpdateAliases;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Request timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
-
 	[JsonInclude, JsonPropertyName("actions")]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Action>? Actions { get; set; }
 }
 
+/// <summary>
+/// <para>Updates index aliases.</para>
+/// </summary>
 public sealed partial class UpdateAliasesRequestDescriptor<TDocument> : RequestDescriptor<UpdateAliasesRequestDescriptor<TDocument>, UpdateAliasesRequestParameters>
 {
 	internal UpdateAliasesRequestDescriptor(Action<UpdateAliasesRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public UpdateAliasesRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementUpdateAliases;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementUpdateAliases;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public UpdateAliasesRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public UpdateAliasesRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
-	private ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Action>? ActionsValue { get; set; }
 
+	private ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Action>? ActionsValue { get; set; }
 	private ActionDescriptor ActionsDescriptor { get; set; }
-
 	private Action<ActionDescriptor> ActionsDescriptorAction { get; set; }
-
 	private Action<ActionDescriptor>[] ActionsDescriptorActions { get; set; }
 
 	public UpdateAliasesRequestDescriptor<TDocument> Actions(ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Action>? actions)
@@ -145,24 +167,29 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Updates index aliases.</para>
+/// </summary>
 public sealed partial class UpdateAliasesRequestDescriptor : RequestDescriptor<UpdateAliasesRequestDescriptor, UpdateAliasesRequestParameters>
 {
 	internal UpdateAliasesRequestDescriptor(Action<UpdateAliasesRequestDescriptor> configure) => configure.Invoke(this);
+
 	public UpdateAliasesRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IndexManagementUpdateAliases;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IndexManagementUpdateAliases;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public UpdateAliasesRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public UpdateAliasesRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
-	private ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Action>? ActionsValue { get; set; }
 
+	private ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Action>? ActionsValue { get; set; }
 	private ActionDescriptor ActionsDescriptor { get; set; }
-
 	private Action<ActionDescriptor> ActionsDescriptorAction { get; set; }
-
 	private Action<ActionDescriptor>[] ActionsDescriptorActions { get; set; }
 
 	public UpdateAliasesRequestDescriptor Actions(ICollection<Elastic.Clients.Elasticsearch.IndexManagement.Action>? actions)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/UpdateAliasesResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/UpdateAliasesResponse.g.cs
index 38dedd43705..59d71f7ca15 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/UpdateAliasesResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexManagement/UpdateAliasesResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class UpdateAliasesResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexRequest.g.cs
index fad1add5d1c..075c3615260 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,44 +27,69 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class IndexRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>only perform the index operation if the last operation that has changed the document has the specified primary term</para>
+	/// </summary>
 	public long? IfPrimaryTerm { get => Q<long?>("if_primary_term"); set => Q("if_primary_term", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>only perform the index operation if the last operation that has changed the document has the specified sequence number</para>
+	/// </summary>
 	public long? IfSeqNo { get => Q<long?>("if_seq_no"); set => Q("if_seq_no", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation type. Defaults to `index` for requests with an explicit document ID, and to `create`for requests without an explicit document ID</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.OpType? OpType { get => Q<Elastic.Clients.Elasticsearch.OpType?>("op_type"); set => Q("op_type", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The pipeline id to preprocess incoming documents with</para>
+	/// </summary>
 	public string? Pipeline { get => Q<string?>("pipeline"); set => Q("pipeline", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Refresh?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit version number for concurrency control</para>
+	/// </summary>
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific version type</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the index operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>When true, requires destination to be an alias. Default is false</para>
+	/// </summary>
 	public bool? RequireAlias { get => Q<bool?>("require_alias"); set => Q("require_alias", value); }
 }
 
+/// <summary>
+/// <para>Creates or updates a document in an index.</para>
+/// </summary>
 public sealed partial class IndexRequest<TDocument> : PlainRequest<IndexRequestParameters>
 {
 	public IndexRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id? id) : base(r => r.Required("index", index).Optional("id", id))
@@ -73,49 +100,89 @@ public IndexRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceIndex;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceIndex;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	[JsonIgnore]
 	public TDocument Document { get; set; }
 
+	/// <summary>
+	/// <para>only perform the index operation if the last operation that has changed the document has the specified primary term</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? IfPrimaryTerm { get => Q<long?>("if_primary_term"); set => Q("if_primary_term", value); }
 
+	/// <summary>
+	/// <para>only perform the index operation if the last operation that has changed the document has the specified sequence number</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? IfSeqNo { get => Q<long?>("if_seq_no"); set => Q("if_seq_no", value); }
 
+	/// <summary>
+	/// <para>Explicit operation type. Defaults to `index` for requests with an explicit document ID, and to `create`for requests without an explicit document ID</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.OpType? OpType { get => Q<Elastic.Clients.Elasticsearch.OpType?>("op_type"); set => Q("op_type", value); }
 
+	/// <summary>
+	/// <para>The pipeline id to preprocess incoming documents with</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Pipeline { get => Q<string?>("pipeline"); set => Q("pipeline", value); }
 
+	/// <summary>
+	/// <para>If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Refresh?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit version number for concurrency control</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? Version { get => Q<long?>("version"); set => Q("version", value); }
 
+	/// <summary>
+	/// <para>Specific version type</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get => Q<Elastic.Clients.Elasticsearch.VersionType?>("version_type"); set => Q("version_type", value); }
 
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the index operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
+	/// <summary>
+	/// <para>When true, requires destination to be an alias. Default is false</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? RequireAlias { get => Q<bool?>("require_alias"); set => Q("require_alias", value); }
 }
 
+/// <summary>
+/// <para>Creates or updates a document in an index.</para>
+/// </summary>
 public sealed partial class IndexRequestDescriptor<TDocument> : RequestDescriptor<IndexRequestDescriptor<TDocument>, IndexRequestParameters>
 {
 	internal IndexRequestDescriptor(Action<IndexRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal IndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id? id) : base(r => r.Required("index", index).Optional("id", id))
 	{
 	}
@@ -124,6 +191,7 @@ internal IndexRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, E
 	public IndexRequestDescriptor(TDocument document, IndexName index, Id id) : this(index, id) => DocumentValue = document;
 	public IndexRequestDescriptor(TDocument document, IndexName index) : this(index, Elasticsearch.Id.From(document)) => DocumentValue = document;
 	public IndexRequestDescriptor(TDocument document, Id id) : this(typeof(TDocument), id) => DocumentValue = document;
+
 	public IndexRequestDescriptor(Id id) : this(typeof(TDocument), id)
 	{
 	}
@@ -136,9 +204,12 @@ internal IndexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceIndex;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceIndex;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public IndexRequestDescriptor<TDocument> IfPrimaryTerm(long? ifPrimaryTerm) => Qs("if_primary_term", ifPrimaryTerm);
 	public IndexRequestDescriptor<TDocument> IfSeqNo(long? ifSeqNo) => Qs("if_seq_no", ifSeqNo);
 	public IndexRequestDescriptor<TDocument> OpType(Elastic.Clients.Elasticsearch.OpType? opType) => Qs("op_type", opType);
@@ -150,6 +221,7 @@ internal IndexRequestDescriptor()
 	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);
+
 	public IndexRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id? id)
 	{
 		RouteValues.Optional("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexResponse.g.cs
index b0c641e310a..25ef9832e8c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/IndexResponse.g.cs
@@ -15,37 +15,32 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class IndexResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("forced_refresh")]
 	public bool? ForcedRefresh { get; init; }
-
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("_primary_term")]
 	public long PrimaryTerm { get; init; }
-
 	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Result Result { get; init; }
-
 	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long SeqNo { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("_version")]
 	public long Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoRequest.g.cs
index e558d02c21c..2e382fd4d80 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,29 +27,41 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class InfoRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Returns basic information about the cluster.</para>
+/// </summary>
 public sealed partial class InfoRequest : PlainRequest<InfoRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceInfo;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceInfo;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Returns basic information about the cluster.</para>
+/// </summary>
 public sealed partial class InfoRequestDescriptor : RequestDescriptor<InfoRequestDescriptor, InfoRequestParameters>
 {
 	internal InfoRequestDescriptor(Action<InfoRequestDescriptor> configure) => configure.Invoke(this);
+
 	public InfoRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceInfo;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceInfo;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoResponse.g.cs
index d373ae10136..91e7726aad7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/InfoResponse.g.cs
@@ -15,28 +15,26 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class InfoResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("cluster_name")]
 	public string ClusterName { get; init; }
-
 	[JsonInclude, JsonPropertyName("cluster_uuid")]
 	public string ClusterUuid { get; init; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-
 	[JsonInclude, JsonPropertyName("tagline")]
 	public string Tagline { get; init; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public Elastic.Clients.Elasticsearch.ElasticsearchVersionInfo Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeletePipelineRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeletePipelineRequest.g.cs
index a7671942e28..a1840516015 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeletePipelineRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeletePipelineRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,36 +27,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed class DeletePipelineRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout for connection to master node</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Deletes a pipeline.</para>
+/// </summary>
 public sealed partial class DeletePipelineRequest : PlainRequest<DeletePipelineRequestParameters>
 {
 	public DeletePipelineRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestDeletePipeline;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestDeletePipeline;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Explicit operation timeout for connection to master node</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Deletes a pipeline.</para>
+/// </summary>
 public sealed partial class DeletePipelineRequestDescriptor<TDocument> : RequestDescriptor<DeletePipelineRequestDescriptor<TDocument>, DeletePipelineRequestParameters>
 {
 	internal DeletePipelineRequestDescriptor(Action<DeletePipelineRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DeletePipelineRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -63,11 +85,15 @@ internal DeletePipelineRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestDeletePipeline;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestDeletePipeline;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public DeletePipelineRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public DeletePipelineRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
+
 	public DeletePipelineRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -79,9 +105,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Deletes a pipeline.</para>
+/// </summary>
 public sealed partial class DeletePipelineRequestDescriptor : RequestDescriptor<DeletePipelineRequestDescriptor, DeletePipelineRequestParameters>
 {
 	internal DeletePipelineRequestDescriptor(Action<DeletePipelineRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeletePipelineRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -90,11 +120,15 @@ internal DeletePipelineRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestDeletePipeline;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestDeletePipeline;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public DeletePipelineRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public DeletePipelineRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
+
 	public DeletePipelineRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeletePipelineResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeletePipelineResponse.g.cs
index 7643cd78df9..35995ee31d3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeletePipelineResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/DeletePipelineResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class DeletePipelineResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GeoIpStatsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GeoIpStatsRequest.g.cs
index a13b14e2a34..e291d2add5e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GeoIpStatsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GeoIpStatsRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,29 +27,41 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed class GeoIpStatsRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Returns statistical information about geoip databases</para>
+/// </summary>
 public sealed partial class GeoIpStatsRequest : PlainRequest<GeoIpStatsRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestGeoIpStats;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestGeoIpStats;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Returns statistical information about geoip databases</para>
+/// </summary>
 public sealed partial class GeoIpStatsRequestDescriptor : RequestDescriptor<GeoIpStatsRequestDescriptor, GeoIpStatsRequestParameters>
 {
 	internal GeoIpStatsRequestDescriptor(Action<GeoIpStatsRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GeoIpStatsRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestGeoIpStats;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestGeoIpStats;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GeoIpStatsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GeoIpStatsResponse.g.cs
index a733af2fed1..921948328db 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GeoIpStatsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GeoIpStatsResponse.g.cs
@@ -15,19 +15,27 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class GeoIpStatsResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>Downloaded GeoIP2 databases for each node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Id, Elastic.Clients.Elasticsearch.Ingest.GeoIpNodeDatabases> Nodes { get; init; }
 
+	/// <summary>
+	/// <para>Download statistics for all GeoIP2 databases.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("stats")]
 	public Elastic.Clients.Elasticsearch.Ingest.GeoIpDownloadStatistics Stats { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetPipelineRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetPipelineRequest.g.cs
index 8c5279638e3..7397ee8c5cc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetPipelineRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetPipelineRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,17 +27,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed class GetPipelineRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout for connection to master node</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return pipelines without their definitions (default: false)</para>
+	/// </summary>
 	public bool? Summary { get => Q<bool?>("summary"); set => Q("summary", value); }
 }
 
+/// <summary>
+/// <para>Returns a pipeline.</para>
+/// </summary>
 public sealed partial class GetPipelineRequest : PlainRequest<GetPipelineRequestParameters>
 {
 	public GetPipelineRequest()
@@ -46,28 +55,45 @@ public GetPipelineRequest(Elastic.Clients.Elasticsearch.Id? id) : base(r => r.Op
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestGetPipeline;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestGetPipeline;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Explicit operation timeout for connection to master node</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Return pipelines without their definitions (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Summary { get => Q<bool?>("summary"); set => Q("summary", value); }
 }
 
+/// <summary>
+/// <para>Returns a pipeline.</para>
+/// </summary>
 public sealed partial class GetPipelineRequestDescriptor<TDocument> : RequestDescriptor<GetPipelineRequestDescriptor<TDocument>, GetPipelineRequestParameters>
 {
 	internal GetPipelineRequestDescriptor(Action<GetPipelineRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetPipelineRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestGetPipeline;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestGetPipeline;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetPipelineRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public GetPipelineRequestDescriptor<TDocument> Summary(bool? summary = true) => Qs("summary", summary);
+
 	public GetPipelineRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id? id)
 	{
 		RouteValues.Optional("id", id);
@@ -79,18 +105,26 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns a pipeline.</para>
+/// </summary>
 public sealed partial class GetPipelineRequestDescriptor : RequestDescriptor<GetPipelineRequestDescriptor, GetPipelineRequestParameters>
 {
 	internal GetPipelineRequestDescriptor(Action<GetPipelineRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetPipelineRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestGetPipeline;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestGetPipeline;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetPipelineRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public GetPipelineRequestDescriptor Summary(bool? summary = true) => Qs("summary", summary);
+
 	public GetPipelineRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id? id)
 	{
 		RouteValues.Optional("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetPipelineResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetPipelineResponse.g.cs
index 019b66de608..9da46ea68de 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetPipelineResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/GetPipelineResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class GetPipelineResponse : DictionaryResponse<string, Elastic.Clients.Elasticsearch.Ingest.Pipeline>
 {
 	public GetPipelineResponse(IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Ingest.Pipeline> dictionary) : base(dictionary)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/ProcessorGrokRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/ProcessorGrokRequest.g.cs
index 08244303dfb..80cef112a30 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/ProcessorGrokRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/ProcessorGrokRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,29 +27,41 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed class ProcessorGrokRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Returns a list of the built-in patterns.</para>
+/// </summary>
 public sealed partial class ProcessorGrokRequest : PlainRequest<ProcessorGrokRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestProcessorGrok;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestProcessorGrok;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Returns a list of the built-in patterns.</para>
+/// </summary>
 public sealed partial class ProcessorGrokRequestDescriptor : RequestDescriptor<ProcessorGrokRequestDescriptor, ProcessorGrokRequestParameters>
 {
 	internal ProcessorGrokRequestDescriptor(Action<ProcessorGrokRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ProcessorGrokRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestProcessorGrok;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestProcessorGrok;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/ProcessorGrokResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/ProcessorGrokResponse.g.cs
index 0864cc575f4..f08cba75a06 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/ProcessorGrokResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/ProcessorGrokResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class ProcessorGrokResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("patterns")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutPipelineRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutPipelineRequest.g.cs
index 1a2d5c774d0..cc91d3081c5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutPipelineRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutPipelineRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,57 +27,97 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed class PutPipelineRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Required version for optimistic concurrency control for pipeline updates</para>
+	/// </summary>
 	public long? IfVersion { get => Q<long?>("if_version"); set => Q("if_version", value); }
 }
 
+/// <summary>
+/// <para>Creates or updates a pipeline.</para>
+/// </summary>
 public sealed partial class PutPipelineRequest : PlainRequest<PutPipelineRequestParameters>
 {
 	public PutPipelineRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestPutPipeline;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestPutPipeline;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Period to wait for a connection to the master node. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Period to wait for a response. If no response is received before the timeout expires, the request fails and returns an error.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Required version for optimistic concurrency control for pipeline updates</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? IfVersion { get => Q<long?>("if_version"); set => Q("if_version", value); }
 
+	/// <summary>
+	/// <para>Optional metadata about the ingest pipeline. May have any contents. This map is not automatically generated by Elasticsearch.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_meta")]
 	public IDictionary<string, object>? Meta { get; set; }
 
+	/// <summary>
+	/// <para>Description of the ingest pipeline.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
 
+	/// <summary>
+	/// <para>Processors to run immediately after a processor failure. Each processor supports a processor-level `on_failure` value. If a processor without an `on_failure` value fails, Elasticsearch uses this pipeline-level parameter as a fallback. The processors in this parameter run sequentially in the order specified. Elasticsearch will not attempt to run the pipeline's remaining processors.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
 
+	/// <summary>
+	/// <para>Processors used to perform transformations on documents before indexing. Processors run sequentially in the order specified.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("processors")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? Processors { get; set; }
 
+	/// <summary>
+	/// <para>Version number used by external systems to track ingest pipelines. This parameter is intended for external systems only. Elasticsearch does not use or validate pipeline version numbers.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
 }
 
+/// <summary>
+/// <para>Creates or updates a pipeline.</para>
+/// </summary>
 public sealed partial class PutPipelineRequestDescriptor<TDocument> : RequestDescriptor<PutPipelineRequestDescriptor<TDocument>, PutPipelineRequestParameters>
 {
 	internal PutPipelineRequestDescriptor(Action<PutPipelineRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PutPipelineRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -84,12 +126,16 @@ internal PutPipelineRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestPutPipeline;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestPutPipeline;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public PutPipelineRequestDescriptor<TDocument> IfVersion(long? ifVersion) => Qs("if_version", ifVersion);
 	public PutPipelineRequestDescriptor<TDocument> MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public PutPipelineRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
+
 	public PutPipelineRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -97,27 +143,20 @@ public PutPipelineRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? ProcessorsValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> ProcessorsDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> ProcessorsDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] ProcessorsDescriptorActions { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private long? VersionValue { get; set; }
 
+	/// <summary>
+	/// <para>Processors to run immediately after a processor failure. Each processor supports a processor-level `on_failure` value. If a processor without an `on_failure` value fails, Elasticsearch uses this pipeline-level parameter as a fallback. The processors in this parameter run sequentially in the order specified. Elasticsearch will not attempt to run the pipeline's remaining processors.</para>
+	/// </summary>
 	public PutPipelineRequestDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
 	{
 		OnFailureDescriptor = null;
@@ -154,6 +193,9 @@ public PutPipelineRequestDescriptor<TDocument> OnFailure(params Action<Processor
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Processors used to perform transformations on documents before indexing. Processors run sequentially in the order specified.</para>
+	/// </summary>
 	public PutPipelineRequestDescriptor<TDocument> Processors(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? processors)
 	{
 		ProcessorsDescriptor = null;
@@ -190,18 +232,27 @@ public PutPipelineRequestDescriptor<TDocument> Processors(params Action<Processo
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Optional metadata about the ingest pipeline. May have any contents. This map is not automatically generated by Elasticsearch.</para>
+	/// </summary>
 	public PutPipelineRequestDescriptor<TDocument> Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		MetaValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Description of the ingest pipeline.</para>
+	/// </summary>
 	public PutPipelineRequestDescriptor<TDocument> Description(string? description)
 	{
 		DescriptionValue = description;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Version number used by external systems to track ingest pipelines. This parameter is intended for external systems only. Elasticsearch does not use or validate pipeline version numbers.</para>
+	/// </summary>
 	public PutPipelineRequestDescriptor<TDocument> Version(long? version)
 	{
 		VersionValue = version;
@@ -295,9 +346,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Creates or updates a pipeline.</para>
+/// </summary>
 public sealed partial class PutPipelineRequestDescriptor : RequestDescriptor<PutPipelineRequestDescriptor, PutPipelineRequestParameters>
 {
 	internal PutPipelineRequestDescriptor(Action<PutPipelineRequestDescriptor> configure) => configure.Invoke(this);
+
 	public PutPipelineRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -306,12 +361,16 @@ internal PutPipelineRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestPutPipeline;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestPutPipeline;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	public PutPipelineRequestDescriptor IfVersion(long? ifVersion) => Qs("if_version", ifVersion);
 	public PutPipelineRequestDescriptor MasterTimeout(Elastic.Clients.Elasticsearch.Duration? masterTimeout) => Qs("master_timeout", masterTimeout);
 	public PutPipelineRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout) => Qs("timeout", timeout);
+
 	public PutPipelineRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -319,27 +378,20 @@ public PutPipelineRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? ProcessorsValue { get; set; }
-
 	private ProcessorDescriptor ProcessorsDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> ProcessorsDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] ProcessorsDescriptorActions { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private long? VersionValue { get; set; }
 
+	/// <summary>
+	/// <para>Processors to run immediately after a processor failure. Each processor supports a processor-level `on_failure` value. If a processor without an `on_failure` value fails, Elasticsearch uses this pipeline-level parameter as a fallback. The processors in this parameter run sequentially in the order specified. Elasticsearch will not attempt to run the pipeline's remaining processors.</para>
+	/// </summary>
 	public PutPipelineRequestDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
 	{
 		OnFailureDescriptor = null;
@@ -376,6 +428,9 @@ public PutPipelineRequestDescriptor OnFailure(params Action<ProcessorDescriptor>
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Processors used to perform transformations on documents before indexing. Processors run sequentially in the order specified.</para>
+	/// </summary>
 	public PutPipelineRequestDescriptor Processors(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? processors)
 	{
 		ProcessorsDescriptor = null;
@@ -412,18 +467,27 @@ public PutPipelineRequestDescriptor Processors(params Action<ProcessorDescriptor
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Optional metadata about the ingest pipeline. May have any contents. This map is not automatically generated by Elasticsearch.</para>
+	/// </summary>
 	public PutPipelineRequestDescriptor Meta(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		MetaValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Description of the ingest pipeline.</para>
+	/// </summary>
 	public PutPipelineRequestDescriptor Description(string? description)
 	{
 		DescriptionValue = description;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Version number used by external systems to track ingest pipelines. This parameter is intended for external systems only. Elasticsearch does not use or validate pipeline version numbers.</para>
+	/// </summary>
 	public PutPipelineRequestDescriptor Version(long? version)
 	{
 		VersionValue = version;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutPipelineResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutPipelineResponse.g.cs
index d4d7f01dddd..c2023a0fa75 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutPipelineResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/PutPipelineResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class PutPipelineResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/SimulateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/SimulateRequest.g.cs
index e37f358fa13..5732254e160 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/SimulateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/SimulateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,14 +27,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed class SimulateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Verbose mode. Display data output for each processor in executed pipeline</para>
+	/// </summary>
 	public bool? Verbose { get => Q<bool?>("verbose"); set => Q("verbose", value); }
 }
 
+/// <summary>
+/// <para>Allows to simulate a pipeline with example documents.</para>
+/// </summary>
 public sealed partial class SimulateRequest : PlainRequest<SimulateRequestParameters>
 {
 	public SimulateRequest()
@@ -43,30 +50,42 @@ public SimulateRequest(Elastic.Clients.Elasticsearch.Id? id) : base(r => r.Optio
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestSimulate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestSimulate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Verbose mode. Display data output for each processor in executed pipeline</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Verbose { get => Q<bool?>("verbose"); set => Q("verbose", value); }
-
 	[JsonInclude, JsonPropertyName("docs")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Document>? Docs { get; set; }
-
 	[JsonInclude, JsonPropertyName("pipeline")]
 	public Elastic.Clients.Elasticsearch.Ingest.Pipeline? Pipeline { get; set; }
 }
 
+/// <summary>
+/// <para>Allows to simulate a pipeline with example documents.</para>
+/// </summary>
 public sealed partial class SimulateRequestDescriptor<TDocument> : RequestDescriptor<SimulateRequestDescriptor<TDocument>, SimulateRequestParameters>
 {
 	internal SimulateRequestDescriptor(Action<SimulateRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SimulateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestSimulate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestSimulate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public SimulateRequestDescriptor<TDocument> Verbose(bool? verbose = true) => Qs("verbose", verbose);
+
 	public SimulateRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id? id)
 	{
 		RouteValues.Optional("id", id);
@@ -74,17 +93,11 @@ public SimulateRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id?
 	}
 
 	private Elastic.Clients.Elasticsearch.Ingest.Pipeline? PipelineValue { get; set; }
-
 	private PipelineDescriptor<TDocument> PipelineDescriptor { get; set; }
-
 	private Action<PipelineDescriptor<TDocument>> PipelineDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Document>? DocsValue { get; set; }
-
 	private DocumentDescriptor DocsDescriptor { get; set; }
-
 	private Action<DocumentDescriptor> DocsDescriptorAction { get; set; }
-
 	private Action<DocumentDescriptor>[] DocsDescriptorActions { get; set; }
 
 	public SimulateRequestDescriptor<TDocument> Pipeline(Elastic.Clients.Elasticsearch.Ingest.Pipeline? pipeline)
@@ -201,17 +214,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Allows to simulate a pipeline with example documents.</para>
+/// </summary>
 public sealed partial class SimulateRequestDescriptor : RequestDescriptor<SimulateRequestDescriptor, SimulateRequestParameters>
 {
 	internal SimulateRequestDescriptor(Action<SimulateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public SimulateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.IngestSimulate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.IngestSimulate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public SimulateRequestDescriptor Verbose(bool? verbose = true) => Qs("verbose", verbose);
+
 	public SimulateRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id? id)
 	{
 		RouteValues.Optional("id", id);
@@ -219,17 +240,11 @@ public SimulateRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id? id)
 	}
 
 	private Elastic.Clients.Elasticsearch.Ingest.Pipeline? PipelineValue { get; set; }
-
 	private PipelineDescriptor PipelineDescriptor { get; set; }
-
 	private Action<PipelineDescriptor> PipelineDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Document>? DocsValue { get; set; }
-
 	private DocumentDescriptor DocsDescriptor { get; set; }
-
 	private Action<DocumentDescriptor> DocsDescriptorAction { get; set; }
-
 	private Action<DocumentDescriptor>[] DocsDescriptorActions { get; set; }
 
 	public SimulateRequestDescriptor Pipeline(Elastic.Clients.Elasticsearch.Ingest.Pipeline? pipeline)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/SimulateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/SimulateResponse.g.cs
index 6f61b750ebc..d0c7fb0f55a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/SimulateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Ingest/SimulateResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class SimulateResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("docs")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetRequest.g.cs
index e1df77e0844..eea07076a6a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,35 +27,54 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class MultiGetRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specifies the node or shard the operation should be performed on. Random by default.</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If `true`, the request is real-time as opposed to near-real-time.</para>
+	/// </summary>
 	public bool? Realtime { get => Q<bool?>("realtime"); set => Q("realtime", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If `true`, the request refreshes relevant shards before retrieving documents.</para>
+	/// </summary>
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Custom value used to route operations to a specific shard.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>True or false to return the `_source` field or not, or a list of fields to return.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of source fields to exclude from the response.<br/>You can also use this parameter to exclude fields from the subset specified in `_source_includes` query parameter.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of source fields to include in the response.<br/>If this parameter is specified, only these source fields are returned. You can exclude fields from this subset using the `_source_excludes` query parameter.<br/>If the `_source` parameter is `false`, this parameter is ignored.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If `true`, retrieves the document fields stored in the index rather than the document `_source`.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("stored_fields"); set => Q("stored_fields", value); }
 }
 
+/// <summary>
+/// <para>Allows to get multiple documents in one request.</para>
+/// </summary>
 public sealed partial class MultiGetRequest : PlainRequest<MultiGetRequestParameters>
 {
 	public MultiGetRequest()
@@ -64,50 +85,90 @@ public MultiGetRequest(Elastic.Clients.Elasticsearch.IndexName? index) : base(r
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceMget;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceMget;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Specifies the node or shard the operation should be performed on. Random by default.</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>If `true`, the request is real-time as opposed to near-real-time.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Realtime { get => Q<bool?>("realtime"); set => Q("realtime", value); }
 
+	/// <summary>
+	/// <para>If `true`, the request refreshes relevant shards before retrieving documents.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>Custom value used to route operations to a specific shard.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>True or false to return the `_source` field or not, or a list of fields to return.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? Source { get => Q<Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam?>("_source"); set => Q("_source", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of source fields to exclude from the response.<br/>You can also use this parameter to exclude fields from the subset specified in `_source_includes` query parameter.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of source fields to include in the response.<br/>If this parameter is specified, only these source fields are returned. You can exclude fields from this subset using the `_source_excludes` query parameter.<br/>If the `_source` parameter is `false`, this parameter is ignored.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
+	/// <summary>
+	/// <para>If `true`, retrieves the document fields stored in the index rather than the document `_source`.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get => Q<Elastic.Clients.Elasticsearch.Fields?>("stored_fields"); set => Q("stored_fields", value); }
 
+	/// <summary>
+	/// <para>The documents you want to retrieve. Required if no index is specified in the request URI.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("docs")]
 	public ICollection<Elastic.Clients.Elasticsearch.Core.MGet.MultiGetOperation>? Docs { get; set; }
 
+	/// <summary>
+	/// <para>The IDs of the documents you want to retrieve. Allowed when the index is specified in the request URI.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("ids")]
 	public Elastic.Clients.Elasticsearch.Ids? Ids { get; set; }
 }
 
+/// <summary>
+/// <para>Allows to get multiple documents in one request.</para>
+/// </summary>
 public sealed partial class MultiGetRequestDescriptor<TDocument> : RequestDescriptor<MultiGetRequestDescriptor<TDocument>, MultiGetRequestParameters>
 {
 	internal MultiGetRequestDescriptor(Action<MultiGetRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MultiGetRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceMget;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceMget;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public MultiGetRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public MultiGetRequestDescriptor<TDocument> SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public MultiGetRequestDescriptor<TDocument> SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -116,6 +177,7 @@ public MultiGetRequestDescriptor()
 	public MultiGetRequestDescriptor<TDocument> Refresh(bool? refresh = true) => Qs("refresh", refresh);
 	public MultiGetRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	public MultiGetRequestDescriptor<TDocument> StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields);
+
 	public MultiGetRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName? index)
 	{
 		RouteValues.Optional("index", index);
@@ -123,15 +185,14 @@ public MultiGetRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Core.MGet.MultiGetOperation>? DocsValue { get; set; }
-
 	private Core.MGet.MultiGetOperationDescriptor DocsDescriptor { get; set; }
-
 	private Action<Core.MGet.MultiGetOperationDescriptor> DocsDescriptorAction { get; set; }
-
 	private Action<Core.MGet.MultiGetOperationDescriptor>[] DocsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ids? IdsValue { get; set; }
 
+	/// <summary>
+	/// <para>The documents you want to retrieve. Required if no index is specified in the request URI.</para>
+	/// </summary>
 	public MultiGetRequestDescriptor<TDocument> Docs(ICollection<Elastic.Clients.Elasticsearch.Core.MGet.MultiGetOperation>? docs)
 	{
 		DocsDescriptor = null;
@@ -168,6 +229,9 @@ public MultiGetRequestDescriptor<TDocument> Docs(params Action<Core.MGet.MultiGe
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The IDs of the documents you want to retrieve. Allowed when the index is specified in the request URI.</para>
+	/// </summary>
 	public MultiGetRequestDescriptor<TDocument> Ids(Elastic.Clients.Elasticsearch.Ids? ids)
 	{
 		IdsValue = ids;
@@ -218,16 +282,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Allows to get multiple documents in one request.</para>
+/// </summary>
 public sealed partial class MultiGetRequestDescriptor : RequestDescriptor<MultiGetRequestDescriptor, MultiGetRequestParameters>
 {
 	internal MultiGetRequestDescriptor(Action<MultiGetRequestDescriptor> configure) => configure.Invoke(this);
+
 	public MultiGetRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceMget;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceMget;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public MultiGetRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfigParam? source) => Qs("_source", source);
 	public MultiGetRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public MultiGetRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
@@ -236,6 +307,7 @@ public MultiGetRequestDescriptor()
 	public MultiGetRequestDescriptor Refresh(bool? refresh = true) => Qs("refresh", refresh);
 	public MultiGetRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	public MultiGetRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) => Qs("stored_fields", storedFields);
+
 	public MultiGetRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName? index)
 	{
 		RouteValues.Optional("index", index);
@@ -243,15 +315,14 @@ public MultiGetRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName?
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Core.MGet.MultiGetOperation>? DocsValue { get; set; }
-
 	private Core.MGet.MultiGetOperationDescriptor DocsDescriptor { get; set; }
-
 	private Action<Core.MGet.MultiGetOperationDescriptor> DocsDescriptorAction { get; set; }
-
 	private Action<Core.MGet.MultiGetOperationDescriptor>[] DocsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ids? IdsValue { get; set; }
 
+	/// <summary>
+	/// <para>The documents you want to retrieve. Required if no index is specified in the request URI.</para>
+	/// </summary>
 	public MultiGetRequestDescriptor Docs(ICollection<Elastic.Clients.Elasticsearch.Core.MGet.MultiGetOperation>? docs)
 	{
 		DocsDescriptor = null;
@@ -288,6 +359,9 @@ public MultiGetRequestDescriptor Docs(params Action<Core.MGet.MultiGetOperationD
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The IDs of the documents you want to retrieve. Allowed when the index is specified in the request URI.</para>
+	/// </summary>
 	public MultiGetRequestDescriptor Ids(Elastic.Clients.Elasticsearch.Ids? ids)
 	{
 		IdsValue = ids;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetResponse.g.cs
index 7a5f601cad3..9228f06c409 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiGetResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class MultiGetResponse<TDocument> : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("docs")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchRequest.g.cs
index 21df1934364..572ec219fb7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -27,47 +29,74 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class MultiSearchRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If false, the request returns an error if any wildcard expression, index alias, or _all value targets only missing or closed indices. This behavior applies even if the request targets other open indices. For example, a request targeting foo*,bar* returns an error if an index starts with foo but no index starts with bar.</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, network roundtrips between the coordinating node and remote clusters are minimized for cross-cluster search requests.</para>
+	/// </summary>
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Type of index that wildcard expressions can match. If the request can target data streams, this argument determines whether wildcard expressions match hidden data streams.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, concrete, expanded or aliased indices are ignored when frozen.</para>
+	/// </summary>
 	public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, missing or closed indices are not included in the response.</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Maximum number of concurrent searches the multi search API can execute.</para>
+	/// </summary>
 	public long? MaxConcurrentSearches { get => Q<long?>("max_concurrent_searches"); set => Q("max_concurrent_searches", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Maximum number of concurrent shard requests that each sub-search request executes per node.</para>
+	/// </summary>
 	public long? MaxConcurrentShardRequests { get => Q<long?>("max_concurrent_shard_requests"); set => Q("max_concurrent_shard_requests", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Defines a threshold that enforces a pre-filter roundtrip to prefilter search shards based on query rewriting if the number of shards the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for instance a shard can not match any documents based on its rewrite method i.e., if date filters are mandatory to match but the shard bounds and the query are disjoint.</para>
+	/// </summary>
 	public long? PreFilterShardSize { get => Q<long?>("pre_filter_shard_size"); set => Q("pre_filter_shard_size", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, hits.total are returned as an integer in the response. Defaults to false, which returns an object.</para>
+	/// </summary>
 	public bool? RestTotalHitsAsInt { get => Q<bool?>("rest_total_hits_as_int"); set => Q("rest_total_hits_as_int", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Custom routing value used to route search operations to a specific shard.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Indicates whether global term and document frequencies should be used when scoring returned documents.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specifies whether aggregation and suggester names should be prefixed by their respective types in the response.</para>
+	/// </summary>
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
 }
 
+/// <summary>
+/// <para>Allows to execute several search operations in one request.</para>
+/// </summary>
 public sealed partial class MultiSearchRequest : PlainRequest<MultiSearchRequestParameters>, IStreamSerializable
 {
 	public MultiSearchRequest()
@@ -78,45 +107,83 @@ public MultiSearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceMsearch;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceMsearch;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>If false, the request returns an error if any wildcard expression, index alias, or _all value targets only missing or closed indices. This behavior applies even if the request targets other open indices. For example, a request targeting foo*,bar* returns an error if an index starts with foo but no index starts with bar.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>If true, network roundtrips between the coordinating node and remote clusters are minimized for cross-cluster search requests.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
+	/// <summary>
+	/// <para>Type of index that wildcard expressions can match. If the request can target data streams, this argument determines whether wildcard expressions match hidden data streams.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>If true, concrete, expanded or aliased indices are ignored when frozen.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
 
+	/// <summary>
+	/// <para>If true, missing or closed indices are not included in the response.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Maximum number of concurrent searches the multi search API can execute.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? MaxConcurrentSearches { get => Q<long?>("max_concurrent_searches"); set => Q("max_concurrent_searches", value); }
 
+	/// <summary>
+	/// <para>Maximum number of concurrent shard requests that each sub-search request executes per node.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? MaxConcurrentShardRequests { get => Q<long?>("max_concurrent_shard_requests"); set => Q("max_concurrent_shard_requests", value); }
 
+	/// <summary>
+	/// <para>Defines a threshold that enforces a pre-filter roundtrip to prefilter search shards based on query rewriting if the number of shards the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for instance a shard can not match any documents based on its rewrite method i.e., if date filters are mandatory to match but the shard bounds and the query are disjoint.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? PreFilterShardSize { get => Q<long?>("pre_filter_shard_size"); set => Q("pre_filter_shard_size", value); }
 
+	/// <summary>
+	/// <para>If true, hits.total are returned as an integer in the response. Defaults to false, which returns an object.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? RestTotalHitsAsInt { get => Q<bool?>("rest_total_hits_as_int"); set => Q("rest_total_hits_as_int", value); }
 
+	/// <summary>
+	/// <para>Custom routing value used to route search operations to a specific shard.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>Indicates whether global term and document frequencies should be used when scoring returned documents.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
+	/// <summary>
+	/// <para>Specifies whether aggregation and suggester names should be prefixed by their respective types in the response.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
-
 	public List<Core.MSearch.SearchRequestItem> Searches { get; set; }
 
 	void IStreamSerializable.Serialize(Stream stream, IElasticsearchClientSettings settings, SerializationFormatting formatting)
@@ -142,16 +209,23 @@ async Task IStreamSerializable.SerializeAsync(Stream stream, IElasticsearchClien
 	}
 }
 
+/// <summary>
+/// <para>Allows to execute several search operations in one request.</para>
+/// </summary>
 public sealed partial class MultiSearchRequestDescriptor<TDocument> : RequestDescriptor<MultiSearchRequestDescriptor<TDocument>, MultiSearchRequestParameters>, IStreamSerializable
 {
 	internal MultiSearchRequestDescriptor(Action<MultiSearchRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MultiSearchRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceMsearch;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceMsearch;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public MultiSearchRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public MultiSearchRequestDescriptor<TDocument> CcsMinimizeRoundtrips(bool? ccsMinimizeRoundtrips = true) => Qs("ccs_minimize_roundtrips", ccsMinimizeRoundtrips);
 	public MultiSearchRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
@@ -164,6 +238,7 @@ public MultiSearchRequestDescriptor()
 	public MultiSearchRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	public MultiSearchRequestDescriptor<TDocument> SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 	public MultiSearchRequestDescriptor<TDocument> TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
+
 	public MultiSearchRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -175,6 +250,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 
 	List<Core.MSearch.SearchRequestItem> _items = new();
+
 	void IStreamSerializable.Serialize(Stream stream, IElasticsearchClientSettings settings, SerializationFormatting formatting)
 	{
 		if (_items is null)
@@ -204,16 +280,23 @@ public MultiSearchRequestDescriptor<TDocument> AddSearch(Core.MSearch.SearchRequ
 	}
 }
 
+/// <summary>
+/// <para>Allows to execute several search operations in one request.</para>
+/// </summary>
 public sealed partial class MultiSearchRequestDescriptor : RequestDescriptor<MultiSearchRequestDescriptor, MultiSearchRequestParameters>, IStreamSerializable
 {
 	internal MultiSearchRequestDescriptor(Action<MultiSearchRequestDescriptor> configure) => configure.Invoke(this);
+
 	public MultiSearchRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceMsearch;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceMsearch;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public MultiSearchRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public MultiSearchRequestDescriptor CcsMinimizeRoundtrips(bool? ccsMinimizeRoundtrips = true) => Qs("ccs_minimize_roundtrips", ccsMinimizeRoundtrips);
 	public MultiSearchRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
@@ -226,6 +309,7 @@ public MultiSearchRequestDescriptor()
 	public MultiSearchRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	public MultiSearchRequestDescriptor SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 	public MultiSearchRequestDescriptor TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
+
 	public MultiSearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -237,6 +321,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 
 	List<Core.MSearch.SearchRequestItem> _items = new();
+
 	void IStreamSerializable.Serialize(Stream stream, IElasticsearchClientSettings settings, SerializationFormatting formatting)
 	{
 		if (_items is null)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs
index 20080f40f12..2e26e205372 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchResponse.g.cs
@@ -15,19 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class MultiSearchResponse<TDocument> : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("responses")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.MSearch.MultiSearchResponseItem<TDocument>> Responses { get; init; }
-
 	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateRequest.g.cs
index 71cd74f769b..fb234fb02e1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -27,26 +29,39 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class MultiSearchTemplateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Indicates whether network round-trips should be minimized as part of cross-cluster search requests execution</para>
+	/// </summary>
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Controls the maximum number of concurrent searches the multi search api will execute</para>
+	/// </summary>
 	public long? MaxConcurrentSearches { get => Q<long?>("max_concurrent_searches"); set => Q("max_concurrent_searches", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Indicates whether hits.total should be rendered as an integer or an object in the rest search response</para>
+	/// </summary>
 	public bool? RestTotalHitsAsInt { get => Q<bool?>("rest_total_hits_as_int"); set => Q("rest_total_hits_as_int", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether aggregation and suggester names should be prefixed by their respective types in the response</para>
+	/// </summary>
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
 }
 
+/// <summary>
+/// <para>Runs multiple templated searches with a single request.</para>
+/// </summary>
 public sealed partial class MultiSearchTemplateRequest : PlainRequest<MultiSearchTemplateRequestParameters>, IStreamSerializable
 {
 	public MultiSearchTemplateRequest()
@@ -57,24 +72,41 @@ public MultiSearchTemplateRequest(Elastic.Clients.Elasticsearch.Indices? indices
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceMsearchTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceMsearchTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Indicates whether network round-trips should be minimized as part of cross-cluster search requests execution</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
+	/// <summary>
+	/// <para>Controls the maximum number of concurrent searches the multi search api will execute</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? MaxConcurrentSearches { get => Q<long?>("max_concurrent_searches"); set => Q("max_concurrent_searches", value); }
 
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
+	/// <summary>
+	/// <para>Indicates whether hits.total should be rendered as an integer or an object in the rest search response</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? RestTotalHitsAsInt { get => Q<bool?>("rest_total_hits_as_int"); set => Q("rest_total_hits_as_int", value); }
 
+	/// <summary>
+	/// <para>Specify whether aggregation and suggester names should be prefixed by their respective types in the response</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
-
 	public List<Core.MSearchTemplate.SearchTemplateRequestItem> SearchTemplates { get; set; }
 
 	void IStreamSerializable.Serialize(Stream stream, IElasticsearchClientSettings settings, SerializationFormatting formatting)
@@ -100,21 +132,29 @@ async Task IStreamSerializable.SerializeAsync(Stream stream, IElasticsearchClien
 	}
 }
 
+/// <summary>
+/// <para>Runs multiple templated searches with a single request.</para>
+/// </summary>
 public sealed partial class MultiSearchTemplateRequestDescriptor<TDocument> : RequestDescriptor<MultiSearchTemplateRequestDescriptor<TDocument>, MultiSearchTemplateRequestParameters>, IStreamSerializable
 {
 	internal MultiSearchTemplateRequestDescriptor(Action<MultiSearchTemplateRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MultiSearchTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceMsearchTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceMsearchTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public MultiSearchTemplateRequestDescriptor<TDocument> CcsMinimizeRoundtrips(bool? ccsMinimizeRoundtrips = true) => Qs("ccs_minimize_roundtrips", ccsMinimizeRoundtrips);
 	public MultiSearchTemplateRequestDescriptor<TDocument> MaxConcurrentSearches(long? maxConcurrentSearches) => Qs("max_concurrent_searches", maxConcurrentSearches);
 	public MultiSearchTemplateRequestDescriptor<TDocument> RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt);
 	public MultiSearchTemplateRequestDescriptor<TDocument> SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 	public MultiSearchTemplateRequestDescriptor<TDocument> TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
+
 	public MultiSearchTemplateRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -126,6 +166,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 
 	List<Core.MSearchTemplate.SearchTemplateRequestItem> _items = new();
+
 	void IStreamSerializable.Serialize(Stream stream, IElasticsearchClientSettings settings, SerializationFormatting formatting)
 	{
 		if (_items is null)
@@ -155,21 +196,29 @@ public MultiSearchTemplateRequestDescriptor<TDocument> Add(Core.MSearchTemplate.
 	}
 }
 
+/// <summary>
+/// <para>Runs multiple templated searches with a single request.</para>
+/// </summary>
 public sealed partial class MultiSearchTemplateRequestDescriptor : RequestDescriptor<MultiSearchTemplateRequestDescriptor, MultiSearchTemplateRequestParameters>, IStreamSerializable
 {
 	internal MultiSearchTemplateRequestDescriptor(Action<MultiSearchTemplateRequestDescriptor> configure) => configure.Invoke(this);
+
 	public MultiSearchTemplateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceMsearchTemplate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceMsearchTemplate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public MultiSearchTemplateRequestDescriptor CcsMinimizeRoundtrips(bool? ccsMinimizeRoundtrips = true) => Qs("ccs_minimize_roundtrips", ccsMinimizeRoundtrips);
 	public MultiSearchTemplateRequestDescriptor MaxConcurrentSearches(long? maxConcurrentSearches) => Qs("max_concurrent_searches", maxConcurrentSearches);
 	public MultiSearchTemplateRequestDescriptor RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt);
 	public MultiSearchTemplateRequestDescriptor SearchType(Elastic.Clients.Elasticsearch.SearchType? searchType) => Qs("search_type", searchType);
 	public MultiSearchTemplateRequestDescriptor TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
+
 	public MultiSearchTemplateRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -181,6 +230,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 
 	List<Core.MSearchTemplate.SearchTemplateRequestItem> _items = new();
+
 	void IStreamSerializable.Serialize(Stream stream, IElasticsearchClientSettings settings, SerializationFormatting formatting)
 	{
 		if (_items is null)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateResponse.g.cs
index 47df288adc0..c1c41cb3605 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateResponse.g.cs
@@ -15,19 +15,20 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class MultiSearchTemplateResponse<TDocument> : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("responses")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.MSearch.MultiSearchResponseItem<TDocument>> Responses { get; init; }
-
 	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeRequest.g.cs
index 0c3d5d95f58..67b13692697 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,54 +27,89 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class OpenPointInTimeRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific the time to live for the point in time</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration>("keep_alive"); set => Q("keep_alive", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 }
 
+/// <summary>
+/// <para>A search request by default executes against the most recent visible data of the target indices,<br/>which is called point in time. Elasticsearch pit (point in time) is a lightweight view into the<br/>state of the data as it existed when initiated. In some cases, it’s preferred to perform multiple<br/>search requests using the same point in time. For example, if refreshes happen between<br/>`search_after` requests, then the results of those requests might not be consistent as changes happening<br/>between searches are only visible to the more recent point in time.</para>
+/// </summary>
 public sealed partial class OpenPointInTimeRequest : PlainRequest<OpenPointInTimeRequestParameters>
 {
 	public OpenPointInTimeRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceOpenPointInTime;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceOpenPointInTime;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Specific the time to live for the point in time</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration>("keep_alive"); set => Q("keep_alive", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 }
 
+/// <summary>
+/// <para>A search request by default executes against the most recent visible data of the target indices,<br/>which is called point in time. Elasticsearch pit (point in time) is a lightweight view into the<br/>state of the data as it existed when initiated. In some cases, it’s preferred to perform multiple<br/>search requests using the same point in time. For example, if refreshes happen between<br/>`search_after` requests, then the results of those requests might not be consistent as changes happening<br/>between searches are only visible to the more recent point in time.</para>
+/// </summary>
 public sealed partial class OpenPointInTimeRequestDescriptor<TDocument> : RequestDescriptor<OpenPointInTimeRequestDescriptor<TDocument>, OpenPointInTimeRequestParameters>
 {
 	internal OpenPointInTimeRequestDescriptor(Action<OpenPointInTimeRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public OpenPointInTimeRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -81,14 +118,18 @@ internal OpenPointInTimeRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceOpenPointInTime;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceOpenPointInTime;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public OpenPointInTimeRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public OpenPointInTimeRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public OpenPointInTimeRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Duration keepAlive) => Qs("keep_alive", keepAlive);
 	public OpenPointInTimeRequestDescriptor<TDocument> Preference(string? preference) => Qs("preference", preference);
 	public OpenPointInTimeRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
+
 	public OpenPointInTimeRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -100,9 +141,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>A search request by default executes against the most recent visible data of the target indices,<br/>which is called point in time. Elasticsearch pit (point in time) is a lightweight view into the<br/>state of the data as it existed when initiated. In some cases, it’s preferred to perform multiple<br/>search requests using the same point in time. For example, if refreshes happen between<br/>`search_after` requests, then the results of those requests might not be consistent as changes happening<br/>between searches are only visible to the more recent point in time.</para>
+/// </summary>
 public sealed partial class OpenPointInTimeRequestDescriptor : RequestDescriptor<OpenPointInTimeRequestDescriptor, OpenPointInTimeRequestParameters>
 {
 	internal OpenPointInTimeRequestDescriptor(Action<OpenPointInTimeRequestDescriptor> configure) => configure.Invoke(this);
+
 	public OpenPointInTimeRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -111,14 +156,18 @@ internal OpenPointInTimeRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceOpenPointInTime;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceOpenPointInTime;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public OpenPointInTimeRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public OpenPointInTimeRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public OpenPointInTimeRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration keepAlive) => Qs("keep_alive", keepAlive);
 	public OpenPointInTimeRequestDescriptor Preference(string? preference) => Qs("preference", preference);
 	public OpenPointInTimeRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
+
 	public OpenPointInTimeRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeResponse.g.cs
index 13ec918197a..653207b35e9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/OpenPointInTimeResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class OpenPointInTimeResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("id")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/PingRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PingRequest.g.cs
index 0c5d0fcfa1d..a79e9fd7669 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/PingRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PingRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,29 +27,41 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class PingRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Returns whether the cluster is running.</para>
+/// </summary>
 public sealed partial class PingRequest : PlainRequest<PingRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespacePing;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespacePing;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Returns whether the cluster is running.</para>
+/// </summary>
 public sealed partial class PingRequestDescriptor : RequestDescriptor<PingRequestDescriptor, PingRequestParameters>
 {
 	internal PingRequestDescriptor(Action<PingRequestDescriptor> configure) => configure.Invoke(this);
+
 	public PingRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespacePing;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespacePing;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.HEAD;
+
 	internal override bool SupportsBody => false;
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/PingResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PingResponse.g.cs
index fa23700b1c5..3bba05308d7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/PingResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PingResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class PingResponse : ElasticsearchResponse
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptRequest.g.cs
index 40c1bda3f5b..91a0fc93971 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,17 +27,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class PutScriptRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 }
 
+/// <summary>
+/// <para>Creates or updates a script.</para>
+/// </summary>
 public sealed partial class PutScriptRequest : PlainRequest<PutScriptRequestParameters>
 {
 	public PutScriptRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
@@ -46,22 +55,34 @@ public PutScriptRequest(Elastic.Clients.Elasticsearch.Id id, Elastic.Clients.Ela
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespacePutScript;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespacePutScript;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Specify timeout for connection to master</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? MasterTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("master_timeout"); set => Q("master_timeout", value); }
 
+	/// <summary>
+	/// <para>Explicit operation timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.StoredScript Script { get; set; }
 }
 
+/// <summary>
+/// <para>Creates or updates a script.</para>
+/// </summary>
 public sealed partial class PutScriptRequestDescriptor<TDocument> : RequestDescriptor<PutScriptRequestDescriptor<TDocument>, PutScriptRequestParameters>
 {
 	internal PutScriptRequestDescriptor(Action<PutScriptRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PutScriptRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -74,11 +95,15 @@ internal PutScriptRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespacePutScript;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespacePutScript;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	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);
@@ -92,9 +117,7 @@ public PutScriptRequestDescriptor<TDocument> Context(Elastic.Clients.Elasticsear
 	}
 
 	private Elastic.Clients.Elasticsearch.StoredScript ScriptValue { get; set; }
-
 	private StoredScriptDescriptor ScriptDescriptor { get; set; }
-
 	private Action<StoredScriptDescriptor> ScriptDescriptorAction { get; set; }
 
 	public PutScriptRequestDescriptor<TDocument> Script(Elastic.Clients.Elasticsearch.StoredScript script)
@@ -144,9 +167,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Creates or updates a script.</para>
+/// </summary>
 public sealed partial class PutScriptRequestDescriptor : RequestDescriptor<PutScriptRequestDescriptor, PutScriptRequestParameters>
 {
 	internal PutScriptRequestDescriptor(Action<PutScriptRequestDescriptor> configure) => configure.Invoke(this);
+
 	public PutScriptRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -159,11 +186,15 @@ internal PutScriptRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespacePutScript;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespacePutScript;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.PUT;
+
 	internal override bool SupportsBody => true;
+
 	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);
@@ -177,9 +208,7 @@ public PutScriptRequestDescriptor Context(Elastic.Clients.Elasticsearch.Name? co
 	}
 
 	private Elastic.Clients.Elasticsearch.StoredScript ScriptValue { get; set; }
-
 	private StoredScriptDescriptor ScriptDescriptor { get; set; }
-
 	private Action<StoredScriptDescriptor> ScriptDescriptorAction { get; set; }
 
 	public PutScriptRequestDescriptor Script(Elastic.Clients.Elasticsearch.StoredScript script)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptResponse.g.cs
index 84902b2c944..d614466ef62 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/PutScriptResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class PutScriptResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalRequest.g.cs
index 364aca3636b..d21bec1eb94 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,23 +27,34 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class RankEvalRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If `false`, the request returns an error if any wildcard expression, index alias, or `_all` value targets only missing or closed indices. This behavior applies even if the request targets other open indices. For example, a request targeting `foo*,bar*` returns an error if an index starts with `foo` but no index starts with `bar`.</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If `true`, missing or closed indices are not included in the response.</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	public string? SearchType { get => Q<string?>("search_type"); set => Q("search_type", value); }
 }
 
+/// <summary>
+/// <para>Enables you to evaluate the quality of ranked search results over a set of typical search queries.</para>
+/// </summary>
 public sealed partial class RankEvalRequest : PlainRequest<RankEvalRequestParameters>
 {
 	public RankEvalRequest()
@@ -52,42 +65,71 @@ public RankEvalRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceRankEval;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceRankEval;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>If `false`, the request returns an error if any wildcard expression, index alias, or `_all` value targets only missing or closed indices. This behavior applies even if the request targets other open indices. For example, a request targeting `foo*,bar*` returns an error if an index starts with `foo` but no index starts with `bar`.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>If `true`, missing or closed indices are not included in the response.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? SearchType { get => Q<string?>("search_type"); set => Q("search_type", value); }
 
+	/// <summary>
+	/// <para>A set of typical search requests, together with their provided ratings.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("requests")]
 	public ICollection<Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalRequestItem> Requests { get; set; }
 
+	/// <summary>
+	/// <para>Definition of the evaluation metric to calculate.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("metric")]
 	public Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetric? Metric { get; set; }
 }
 
+/// <summary>
+/// <para>Enables you to evaluate the quality of ranked search results over a set of typical search queries.</para>
+/// </summary>
 public sealed partial class RankEvalRequestDescriptor<TDocument> : RequestDescriptor<RankEvalRequestDescriptor<TDocument>, RankEvalRequestParameters>
 {
 	internal RankEvalRequestDescriptor(Action<RankEvalRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RankEvalRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceRankEval;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceRankEval;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public RankEvalRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public RankEvalRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public RankEvalRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public RankEvalRequestDescriptor<TDocument> SearchType(string? searchType) => Qs("search_type", searchType);
+
 	public RankEvalRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -95,19 +137,16 @@ public RankEvalRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearc
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalRequestItem> RequestsValue { get; set; }
-
 	private Core.RankEval.RankEvalRequestItemDescriptor<TDocument> RequestsDescriptor { get; set; }
-
 	private Action<Core.RankEval.RankEvalRequestItemDescriptor<TDocument>> RequestsDescriptorAction { get; set; }
-
 	private Action<Core.RankEval.RankEvalRequestItemDescriptor<TDocument>>[] RequestsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetric? MetricValue { get; set; }
-
 	private Core.RankEval.RankEvalMetricDescriptor MetricDescriptor { get; set; }
-
 	private Action<Core.RankEval.RankEvalMetricDescriptor> MetricDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>A set of typical search requests, together with their provided ratings.</para>
+	/// </summary>
 	public RankEvalRequestDescriptor<TDocument> Requests(ICollection<Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalRequestItem> requests)
 	{
 		RequestsDescriptor = null;
@@ -144,6 +183,9 @@ public RankEvalRequestDescriptor<TDocument> Requests(params Action<Core.RankEval
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Definition of the evaluation metric to calculate.</para>
+	/// </summary>
 	public RankEvalRequestDescriptor<TDocument> Metric(Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetric? metric)
 	{
 		MetricDescriptor = null;
@@ -222,20 +264,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Enables you to evaluate the quality of ranked search results over a set of typical search queries.</para>
+/// </summary>
 public sealed partial class RankEvalRequestDescriptor : RequestDescriptor<RankEvalRequestDescriptor, RankEvalRequestParameters>
 {
 	internal RankEvalRequestDescriptor(Action<RankEvalRequestDescriptor> configure) => configure.Invoke(this);
+
 	public RankEvalRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceRankEval;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceRankEval;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public RankEvalRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public RankEvalRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public RankEvalRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public RankEvalRequestDescriptor SearchType(string? searchType) => Qs("search_type", searchType);
+
 	public RankEvalRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -243,19 +293,16 @@ public RankEvalRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices?
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalRequestItem> RequestsValue { get; set; }
-
 	private Core.RankEval.RankEvalRequestItemDescriptor RequestsDescriptor { get; set; }
-
 	private Action<Core.RankEval.RankEvalRequestItemDescriptor> RequestsDescriptorAction { get; set; }
-
 	private Action<Core.RankEval.RankEvalRequestItemDescriptor>[] RequestsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetric? MetricValue { get; set; }
-
 	private Core.RankEval.RankEvalMetricDescriptor MetricDescriptor { get; set; }
-
 	private Action<Core.RankEval.RankEvalMetricDescriptor> MetricDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>A set of typical search requests, together with their provided ratings.</para>
+	/// </summary>
 	public RankEvalRequestDescriptor Requests(ICollection<Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalRequestItem> requests)
 	{
 		RequestsDescriptor = null;
@@ -292,6 +339,9 @@ public RankEvalRequestDescriptor Requests(params Action<Core.RankEval.RankEvalRe
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Definition of the evaluation metric to calculate.</para>
+	/// </summary>
 	public RankEvalRequestDescriptor Metric(Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetric? metric)
 	{
 		MetricDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalResponse.g.cs
index f4b324ab624..8d224db5a25 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/RankEvalResponse.g.cs
@@ -15,22 +15,29 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class RankEvalResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>The details section contains one entry for every query in the original requests section, keyed by the search request id</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("details")]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Id, Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricDetail> Details { get; init; }
-
 	[JsonInclude, JsonPropertyName("failures")]
 	public IReadOnlyDictionary<string, object> Failures { get; init; }
 
+	/// <summary>
+	/// <para>The overall evaluation quality calculated by the defined metric</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("metric_score")]
 	public double MetricScore { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRequest.g.cs
index a7572df96e9..9a56bde9f63 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,93 +27,132 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class ReindexRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Should the affected indexes be refreshed?</para>
+	/// </summary>
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The throttle to set on this request in sub-requests per second. -1 means no throttle.</para>
+	/// </summary>
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Control how long to keep the search context alive</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The number of slices this task should be divided into. Defaults to 1, meaning the task isn't sliced into subtasks. Can be set to `auto`.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Slices? Slices { get => Q<Elastic.Clients.Elasticsearch.Slices?>("slices"); set => Q("slices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Time each individual bulk request should wait for shards that are unavailable.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the reindex operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Should the request should block until the reindex is complete.</para>
+	/// </summary>
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
-
-	[JsonIgnore]
 	public bool? RequireAlias { get => Q<bool?>("require_alias"); set => Q("require_alias", value); }
 }
 
+/// <summary>
+/// <para>Allows to copy documents from one index to another, optionally filtering the source<br/>documents by a query, changing the destination index settings, or fetching the<br/>documents from a remote cluster.</para>
+/// </summary>
 public sealed partial class ReindexRequest : PlainRequest<ReindexRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceReindex;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceReindex;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Should the affected indexes be refreshed?</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>The throttle to set on this request in sub-requests per second. -1 means no throttle.</para>
+	/// </summary>
 	[JsonIgnore]
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
+	/// <summary>
+	/// <para>Control how long to keep the search context alive</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
+	/// <summary>
+	/// <para>The number of slices this task should be divided into. Defaults to 1, meaning the task isn't sliced into subtasks. Can be set to `auto`.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Slices? Slices { get => Q<Elastic.Clients.Elasticsearch.Slices?>("slices"); set => Q("slices", value); }
 
+	/// <summary>
+	/// <para>Time each individual bulk request should wait for shards that are unavailable.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the reindex operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
+	/// <summary>
+	/// <para>Should the request should block until the reindex is complete.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
-
 	[JsonIgnore]
 	public bool? RequireAlias { get => Q<bool?>("require_alias"); set => Q("require_alias", value); }
-
 	[JsonInclude, JsonPropertyName("conflicts")]
 	public Elastic.Clients.Elasticsearch.Conflicts? Conflicts { get; set; }
-
 	[JsonInclude, JsonPropertyName("dest")]
 	public Elastic.Clients.Elasticsearch.Core.Reindex.Destination Dest { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_docs")]
 	public long? MaxDocs { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("size")]
 	public long? Size { get; set; }
-
 	[JsonInclude, JsonPropertyName("source")]
 	public Elastic.Clients.Elasticsearch.Core.Reindex.Source Source { get; set; }
 }
 
+/// <summary>
+/// <para>Allows to copy documents from one index to another, optionally filtering the source<br/>documents by a query, changing the destination index settings, or fetching the<br/>documents from a remote cluster.</para>
+/// </summary>
 public sealed partial class ReindexRequestDescriptor<TDocument> : RequestDescriptor<ReindexRequestDescriptor<TDocument>, ReindexRequestParameters>
 {
 	internal ReindexRequestDescriptor(Action<ReindexRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ReindexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceReindex;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceReindex;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public ReindexRequestDescriptor<TDocument> Refresh(bool? refresh = true) => Qs("refresh", refresh);
 	public ReindexRequestDescriptor<TDocument> RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
 	public ReindexRequestDescriptor<TDocument> RequireAlias(bool? requireAlias = true) => Qs("require_alias", requireAlias);
@@ -120,24 +161,16 @@ public ReindexRequestDescriptor()
 	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 Elastic.Clients.Elasticsearch.Core.Reindex.Source SourceValue { get; set; }
 
+	private Elastic.Clients.Elasticsearch.Core.Reindex.Source SourceValue { get; set; }
 	private Core.Reindex.SourceDescriptor<TDocument> SourceDescriptor { get; set; }
-
 	private Action<Core.Reindex.SourceDescriptor<TDocument>> SourceDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Conflicts? ConflictsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Reindex.Destination DestValue { get; set; }
-
 	private Core.Reindex.DestinationDescriptor DestDescriptor { get; set; }
-
 	private Action<Core.Reindex.DestinationDescriptor> DestDescriptorAction { get; set; }
-
 	private long? MaxDocsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private long? SizeValue { get; set; }
 
 	public ReindexRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Reindex.Source source)
@@ -275,16 +308,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Allows to copy documents from one index to another, optionally filtering the source<br/>documents by a query, changing the destination index settings, or fetching the<br/>documents from a remote cluster.</para>
+/// </summary>
 public sealed partial class ReindexRequestDescriptor : RequestDescriptor<ReindexRequestDescriptor, ReindexRequestParameters>
 {
 	internal ReindexRequestDescriptor(Action<ReindexRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ReindexRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceReindex;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceReindex;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public ReindexRequestDescriptor Refresh(bool? refresh = true) => Qs("refresh", refresh);
 	public ReindexRequestDescriptor RequestsPerSecond(float? requestsPerSecond) => Qs("requests_per_second", requestsPerSecond);
 	public ReindexRequestDescriptor RequireAlias(bool? requireAlias = true) => Qs("require_alias", requireAlias);
@@ -293,24 +333,16 @@ public ReindexRequestDescriptor()
 	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 Elastic.Clients.Elasticsearch.Core.Reindex.Source SourceValue { get; set; }
 
+	private Elastic.Clients.Elasticsearch.Core.Reindex.Source SourceValue { get; set; }
 	private Core.Reindex.SourceDescriptor SourceDescriptor { get; set; }
-
 	private Action<Core.Reindex.SourceDescriptor> SourceDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Conflicts? ConflictsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Reindex.Destination DestValue { get; set; }
-
 	private Core.Reindex.DestinationDescriptor DestDescriptor { get; set; }
-
 	private Action<Core.Reindex.DestinationDescriptor> DestDescriptorAction { get; set; }
-
 	private long? MaxDocsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private long? SizeValue { get; set; }
 
 	public ReindexRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Reindex.Source source)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexResponse.g.cs
index aae5f057d08..089b104826d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexResponse.g.cs
@@ -15,61 +15,48 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ReindexResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("batches")]
 	public long? Batches { get; init; }
-
 	[JsonInclude, JsonPropertyName("created")]
 	public long? Created { get; init; }
-
 	[JsonInclude, JsonPropertyName("deleted")]
 	public long? Deleted { get; init; }
-
 	[JsonInclude, JsonPropertyName("failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.BulkIndexByScrollFailure>? Failures { get; init; }
-
 	[JsonInclude, JsonPropertyName("noops")]
 	public long? Noops { get; init; }
-
 	[JsonInclude, JsonPropertyName("requests_per_second")]
 	public float? RequestsPerSecond { get; init; }
-
 	[JsonInclude, JsonPropertyName("retries")]
 	public Elastic.Clients.Elasticsearch.Retries? Retries { get; init; }
-
 	[JsonInclude, JsonPropertyName("slice_id")]
 	public int? SliceId { get; init; }
-
 	[JsonInclude, JsonPropertyName("task")]
 	public Elastic.Clients.Elasticsearch.TaskId? Task { get; init; }
-
 	[JsonInclude, JsonPropertyName("throttled_millis")]
 	public long? ThrottledMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("throttled_until_millis")]
 	public long? ThrottledUntilMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool? TimedOut { get; init; }
-
 	[JsonInclude, JsonPropertyName("took")]
 	public long? Took { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public long? Total { get; init; }
-
 	[JsonInclude, JsonPropertyName("updated")]
 	public long? Updated { get; init; }
-
 	[JsonInclude, JsonPropertyName("version_conflicts")]
 	public long? VersionConflicts { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleRequest.g.cs
index 385efa7e330..9a4025a035d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,30 +27,45 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class ReindexRethrottleRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The throttle to set on this request in floating sub-requests per second. -1 means set no throttle.</para>
+	/// </summary>
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 }
 
+/// <summary>
+/// <para>Changes the number of requests per second for a particular Reindex operation.</para>
+/// </summary>
 public sealed partial class ReindexRethrottleRequest : PlainRequest<ReindexRethrottleRequestParameters>
 {
 	public ReindexRethrottleRequest(Elastic.Clients.Elasticsearch.Id task_id) : base(r => r.Required("task_id", task_id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceReindexRethrottle;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceReindexRethrottle;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>The throttle to set on this request in floating sub-requests per second. -1 means set no throttle.</para>
+	/// </summary>
 	[JsonIgnore]
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 }
 
+/// <summary>
+/// <para>Changes the number of requests per second for a particular Reindex operation.</para>
+/// </summary>
 public sealed partial class ReindexRethrottleRequestDescriptor : RequestDescriptor<ReindexRethrottleRequestDescriptor, ReindexRethrottleRequestParameters>
 {
 	internal ReindexRethrottleRequestDescriptor(Action<ReindexRethrottleRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ReindexRethrottleRequestDescriptor(Elastic.Clients.Elasticsearch.Id task_id) : base(r => r.Required("task_id", task_id))
 	{
 	}
@@ -57,10 +74,14 @@ internal ReindexRethrottleRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceReindexRethrottle;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceReindexRethrottle;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	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/ReindexRethrottleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleResponse.g.cs
index 8542ab58d2e..645bc2d3d38 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ReindexRethrottleResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ReindexRethrottleResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("nodes")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollRequest.g.cs
index 61ebab795c7..103d6fe3f00 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,50 +27,80 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class ScrollRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, the API response’s hit.total property is returned as an integer. If false, the API response’s hit.total property is returned as an object.</para>
+	/// </summary>
 	public bool? RestTotalHitsAsInt { get => Q<bool?>("rest_total_hits_as_int"); set => Q("rest_total_hits_as_int", value); }
 }
 
+/// <summary>
+/// <para>Allows to retrieve a large numbers of results from a single search request.</para>
+/// </summary>
 public sealed partial class ScrollRequest : PlainRequest<ScrollRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceScroll;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceScroll;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>If true, the API response’s hit.total property is returned as an integer. If false, the API response’s hit.total property is returned as an object.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? RestTotalHitsAsInt { get => Q<bool?>("rest_total_hits_as_int"); set => Q("rest_total_hits_as_int", value); }
 
+	/// <summary>
+	/// <para>Period to retain the search context for scrolling.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("scroll")]
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get; set; }
 
+	/// <summary>
+	/// <para>Scroll ID of the search.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("scroll_id")]
 	public Elastic.Clients.Elasticsearch.ScrollId ScrollId { get; set; }
 }
 
+/// <summary>
+/// <para>Allows to retrieve a large numbers of results from a single search request.</para>
+/// </summary>
 public sealed partial class ScrollRequestDescriptor : RequestDescriptor<ScrollRequestDescriptor, ScrollRequestParameters>
 {
 	internal ScrollRequestDescriptor(Action<ScrollRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ScrollRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceScroll;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceScroll;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public ScrollRequestDescriptor RestTotalHitsAsInt(bool? restTotalHitsAsInt = true) => Qs("rest_total_hits_as_int", restTotalHitsAsInt);
-	private Elastic.Clients.Elasticsearch.Duration? ScrollValue { get; set; }
 
+	private Elastic.Clients.Elasticsearch.Duration? ScrollValue { get; set; }
 	private Elastic.Clients.Elasticsearch.ScrollId ScrollIdValue { get; set; }
 
+	/// <summary>
+	/// <para>Period to retain the search context for scrolling.</para>
+	/// </summary>
 	public ScrollRequestDescriptor Scroll(Elastic.Clients.Elasticsearch.Duration? scroll)
 	{
 		ScrollValue = scroll;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Scroll ID of the search.</para>
+	/// </summary>
 	public ScrollRequestDescriptor ScrollId(Elastic.Clients.Elasticsearch.ScrollId scrollId)
 	{
 		ScrollIdValue = scrollId;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollResponse.g.cs
index 48e4f6b38e5..0a123a0fc18 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScrollResponse.g.cs
@@ -15,52 +15,42 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ScrollResponse<TDocument> : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary? Aggregations { get; init; }
-
 	[JsonInclude, JsonPropertyName("_clusters")]
 	public Elastic.Clients.Elasticsearch.ClusterStatistics? Clusters { get; init; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<TDocument> HitsMetadata { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_score")]
 	public double? MaxScore { get; init; }
-
 	[JsonInclude, JsonPropertyName("num_reduce_phases")]
 	public long? NumReducePhases { get; init; }
-
 	[JsonInclude, JsonPropertyName("pit_id")]
 	public string? PitId { get; init; }
-
 	[JsonInclude, JsonPropertyName("profile")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Profile? Profile { get; init; }
-
 	[JsonInclude, JsonPropertyName("_scroll_id")]
 	public Elastic.Clients.Elasticsearch.ScrollId? ScrollId { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("terminated_early")]
 	public bool? TerminatedEarly { get; init; }
-
 	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool TimedOut { get; init; }
-
 	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs
index 3b71a89e3de..3d4b2e6cecf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,95 +27,153 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class SearchRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Indicate if an error should be returned if there is a partial search failure or timeout</para>
+	/// </summary>
 	public bool? AllowPartialSearchResults { get => Q<bool?>("allow_partial_search_results"); set => Q("allow_partial_search_results", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The analyzer to use for the query string</para>
+	/// </summary>
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether wildcard and prefix queries should be analyzed (default: false)</para>
+	/// </summary>
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The number of shard results that should be reduced at once on the coordinating node. This value should be used as a protection mechanism to reduce the memory overhead per search request if the potential number of shards in the request can be large.</para>
+	/// </summary>
 	public long? BatchedReduceSize { get => Q<long?>("batched_reduce_size"); set => Q("batched_reduce_size", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Indicates whether network round-trips should be minimized as part of cross-cluster search requests execution</para>
+	/// </summary>
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The field to use as default where no field prefix is given in the query string</para>
+	/// </summary>
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete, expanded or aliased indices should be ignored when throttled</para>
+	/// </summary>
 	public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The number of concurrent shard requests per node this search executes concurrently. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests</para>
+	/// </summary>
 	public long? MaxConcurrentShardRequests { get => Q<long?>("max_concurrent_shard_requests"); set => Q("max_concurrent_shard_requests", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The minimum compatible version that all shards involved in search should have for this request to be successful</para>
+	/// </summary>
 	public string? MinCompatibleShardNode { get => Q<string?>("min_compatible_shard_node"); set => Q("min_compatible_shard_node", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A threshold that enforces a pre-filter roundtrip to prefilter search shards based on query rewriting if the number of shards the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for instance a shard can not match any documents based on its rewrite method ie. if date filters are mandatory to match but the shard bounds and the query are disjoint.</para>
+	/// </summary>
 	public long? PreFilterShardSize { get => Q<long?>("pre_filter_shard_size"); set => Q("pre_filter_shard_size", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify if request cache should be used for this request or not, defaults to index level setting</para>
+	/// </summary>
 	public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of specific routing values</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify how long a consistent view of the index should be maintained for scrolled search</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specifies which field to use for suggestions.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Field? SuggestField { get => Q<Elastic.Clients.Elasticsearch.Field?>("suggest_field"); set => Q("suggest_field", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify suggest mode</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.SuggestMode? SuggestMode { get => Q<Elastic.Clients.Elasticsearch.SuggestMode?>("suggest_mode"); set => Q("suggest_mode", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>How many suggestions to return in response</para>
+	/// </summary>
 	public long? SuggestSize { get => Q<long?>("suggest_size"); set => Q("suggest_size", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The source text for which the suggestions should be returned.</para>
+	/// </summary>
 	public string? SuggestText { get => Q<string?>("suggest_text"); set => Q("suggest_text", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether aggregation and suggester names should be prefixed by their respective types in the response</para>
+	/// </summary>
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Indicates whether hits.total should be rendered as an integer or an object in the rest search response</para>
+	/// </summary>
 	public bool? RestTotalHitsAsInt { get => Q<bool?>("rest_total_hits_as_int"); set => Q("rest_total_hits_as_int", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A list of fields to exclude from the returned _source field</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A list of fields to extract and return from the _source field</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Query in the Lucene query string syntax</para>
+	/// </summary>
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
 }
 
@@ -526,6 +586,9 @@ public override void Write(Utf8JsonWriter writer, SearchRequest value, JsonSeria
 }
 
 [JsonConverter(typeof(SearchRequestConverter))]
+/// <summary>
+/// <para>Returns results matching a query.</para>
+/// </summary>
 public partial class SearchRequest : PlainRequest<SearchRequestParameters>
 {
 	public SearchRequest()
@@ -536,203 +599,356 @@ public SearchRequest(Elastic.Clients.Elasticsearch.Indices? indices) : base(r =>
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceSearch;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceSearch;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Indicate if an error should be returned if there is a partial search failure or timeout</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowPartialSearchResults { get => Q<bool?>("allow_partial_search_results"); set => Q("allow_partial_search_results", value); }
 
+	/// <summary>
+	/// <para>The analyzer to use for the query string</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
+	/// <summary>
+	/// <para>Specify whether wildcard and prefix queries should be analyzed (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
+	/// <summary>
+	/// <para>The number of shard results that should be reduced at once on the coordinating node. This value should be used as a protection mechanism to reduce the memory overhead per search request if the potential number of shards in the request can be large.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? BatchedReduceSize { get => Q<long?>("batched_reduce_size"); set => Q("batched_reduce_size", value); }
 
+	/// <summary>
+	/// <para>Indicates whether network round-trips should be minimized as part of cross-cluster search requests execution</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? CcsMinimizeRoundtrips { get => Q<bool?>("ccs_minimize_roundtrips"); set => Q("ccs_minimize_roundtrips", value); }
 
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
+	/// <summary>
+	/// <para>The field to use as default where no field prefix is given in the query string</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete, expanded or aliased indices should be ignored when throttled</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreThrottled { get => Q<bool?>("ignore_throttled"); set => Q("ignore_throttled", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
+	/// <summary>
+	/// <para>The number of concurrent shard requests per node this search executes concurrently. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? MaxConcurrentShardRequests { get => Q<long?>("max_concurrent_shard_requests"); set => Q("max_concurrent_shard_requests", value); }
 
+	/// <summary>
+	/// <para>The minimum compatible version that all shards involved in search should have for this request to be successful</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? MinCompatibleShardNode { get => Q<string?>("min_compatible_shard_node"); set => Q("min_compatible_shard_node", value); }
 
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>A threshold that enforces a pre-filter roundtrip to prefilter search shards based on query rewriting if the number of shards the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for instance a shard can not match any documents based on its rewrite method ie. if date filters are mandatory to match but the shard bounds and the query are disjoint.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? PreFilterShardSize { get => Q<long?>("pre_filter_shard_size"); set => Q("pre_filter_shard_size", value); }
 
+	/// <summary>
+	/// <para>Specify if request cache should be used for this request or not, defaults to index level setting</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of specific routing values</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>Specify how long a consistent view of the index should be maintained for scrolled search</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
+	/// <summary>
+	/// <para>Specifies which field to use for suggestions.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Field? SuggestField { get => Q<Elastic.Clients.Elasticsearch.Field?>("suggest_field"); set => Q("suggest_field", value); }
 
+	/// <summary>
+	/// <para>Specify suggest mode</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.SuggestMode? SuggestMode { get => Q<Elastic.Clients.Elasticsearch.SuggestMode?>("suggest_mode"); set => Q("suggest_mode", value); }
 
+	/// <summary>
+	/// <para>How many suggestions to return in response</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? SuggestSize { get => Q<long?>("suggest_size"); set => Q("suggest_size", value); }
 
+	/// <summary>
+	/// <para>The source text for which the suggestions should be returned.</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? SuggestText { get => Q<string?>("suggest_text"); set => Q("suggest_text", value); }
 
+	/// <summary>
+	/// <para>Specify whether aggregation and suggester names should be prefixed by their respective types in the response</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
 
+	/// <summary>
+	/// <para>Indicates whether hits.total should be rendered as an integer or an object in the rest search response</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? RestTotalHitsAsInt { get => Q<bool?>("rest_total_hits_as_int"); set => Q("rest_total_hits_as_int", value); }
 
+	/// <summary>
+	/// <para>A list of fields to exclude from the returned _source field</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
+	/// <summary>
+	/// <para>A list of fields to extract and return from the _source field</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
+	/// <summary>
+	/// <para>Query in the Lucene query string syntax</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? QueryLuceneSyntax { get => Q<string?>("q"); set => Q("q", value); }
-
 	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? Collapse { get; set; }
 
+	/// <summary>
+	/// <para>If true, returns detailed information about score computation as part of a hit.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
+	/// <summary>
+	/// <para>Configuration of search extensions defined by Elasticsearch plugins.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("ext")]
 	public IDictionary<string, object>? Ext { get; set; }
 
+	/// <summary>
+	/// <para>Starting document offset. By default, you cannot page through more than 10,000<br/>hits using the from and size parameters. To page through more hits, use the<br/>search_after parameter.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
-
 	[JsonInclude, JsonPropertyName("highlight")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Highlight? Highlight { get; set; }
 
+	/// <summary>
+	/// <para>Number of hits matching the query to count accurately. If true, the exact<br/>number of hits is returned at the cost of some performance. If false, the<br/>response does not include the total number of hits matching the query.<br/>Defaults to 10,000 hits.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("track_total_hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHits { get; set; }
 
+	/// <summary>
+	/// <para>Boosts the _score of documents from specified indices.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("indices_boost")]
 	public ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? IndicesBoost { get; set; }
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns doc values for field<br/>names matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("docvalue_fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
 
+	/// <summary>
+	/// <para>Defines the approximate kNN search to run.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("knn")]
 	public Elastic.Clients.Elasticsearch.KnnQuery? Knn { get; set; }
 
+	/// <summary>
+	/// <para>Minimum _score for matching documents. Documents with a lower _score are<br/>not included in the search results.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("min_score")]
 	public double? MinScore { get; set; }
-
 	[JsonInclude, JsonPropertyName("post_filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilter { get; set; }
-
 	[JsonInclude, JsonPropertyName("profile")]
 	public bool? Profile { get; set; }
 
+	/// <summary>
+	/// <para>Defines the search definition using the Query DSL.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("rescore"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Core.Search.Rescore))]
 	public ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>? Rescore { get; set; }
 
+	/// <summary>
+	/// <para>Retrieve a script evaluation (based on different fields) for each hit.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfter { get; set; }
 
+	/// <summary>
+	/// <para>The number of hits to return. By default, you cannot page through more<br/>than 10,000 hits using the from and size parameters. To page through more<br/>hits, use the search_after parameter.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
-
 	[JsonInclude, JsonPropertyName("slice")]
 	public Elastic.Clients.Elasticsearch.SlicedScroll? Slice { get; set; }
-
 	[JsonInclude, JsonPropertyName("sort"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 
+	/// <summary>
+	/// <para>Indicates which source fields are returned for matching documents. These<br/>fields are returned in the hits._source property of the search response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns values for field names<br/>matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("suggest")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Suggester? Suggest { get; set; }
 
+	/// <summary>
+	/// <para>Maximum number of documents to collect for each shard. If a query reaches this<br/>limit, Elasticsearch terminates the query early. Elasticsearch collects documents<br/>before sorting. Defaults to 0, which does not terminate query execution early.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("terminate_after")]
 	public long? TerminateAfter { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the period of time to wait for a response from each shard. If no response<br/>is received before the timeout expires, the request fails and returns an error.<br/>Defaults to no timeout.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("timeout")]
 	public string? Timeout { get; set; }
 
+	/// <summary>
+	/// <para>If true, calculate and return document scores, even if the scores are not used for sorting.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("track_scores")]
 	public bool? TrackScores { get; set; }
 
+	/// <summary>
+	/// <para>If true, returns document version as part of a hit.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 
+	/// <summary>
+	/// <para>If true, returns sequence number and primary term of the last modification<br/>of each hit. See Optimistic concurrency control.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("seq_no_primary_term")]
 	public bool? SeqNoPrimaryTerm { get; set; }
 
+	/// <summary>
+	/// <para>List of stored fields to return as part of a hit. If no fields are specified,<br/>no stored fields are included in the response. If this field is specified, the _source<br/>parameter defaults to false. You can pass _source: true to return both source fields<br/>and stored fields in the search response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("stored_fields")]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get; set; }
 
+	/// <summary>
+	/// <para>Limits the search to a point in time (PIT). If you provide a PIT, you<br/>cannot specify an <index> in the request path.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("pit")]
 	public Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? Pit { get; set; }
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
+	/// <summary>
+	/// <para>Stats groups to associate with the search. Each group maintains a statistics<br/>aggregation for its associated searches. You can retrieve these stats using<br/>the indices stats API.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("stats")]
 	public ICollection<string>? Stats { get; set; }
 }
 
-public sealed partial class SearchRequest<TInferDocument> : SearchRequest
+/// <summary>
+/// <para>Returns results matching a query.</para>
+/// </summary>
+public partial class SearchRequest<TInferDocument> : SearchRequest
 {
 	public SearchRequest() : base(typeof(TInferDocument))
 	{
 	}
 }
 
+/// <summary>
+/// <para>Returns results matching a query.</para>
+/// </summary>
 public sealed partial class SearchRequestDescriptor<TDocument> : RequestDescriptor<SearchRequestDescriptor<TDocument>, SearchRequestParameters>
 {
 	internal SearchRequestDescriptor(Action<SearchRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SearchRequestDescriptor() : this(typeof(TDocument))
 	{
 	}
@@ -741,9 +957,12 @@ public SearchRequestDescriptor(Elasticsearch.Indices? indices) : base(r => r.Opt
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceSearch;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceSearch;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public SearchRequestDescriptor<TDocument> SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public SearchRequestDescriptor<TDocument> SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
 	public SearchRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
@@ -773,6 +992,7 @@ public SearchRequestDescriptor(Elasticsearch.Indices? indices) : base(r => r.Opt
 	public SearchRequestDescriptor<TDocument> SuggestSize(long? suggestSize) => Qs("suggest_size", suggestSize);
 	public SearchRequestDescriptor<TDocument> SuggestText(string? suggestText) => Qs("suggest_text", suggestText);
 	public SearchRequestDescriptor<TDocument> TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
+
 	public SearchRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -780,127 +1000,66 @@ public SearchRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; }
-
 	private Core.Search.FieldCollapseDescriptor<TDocument> CollapseDescriptor { get; set; }
-
 	private Action<Core.Search.FieldCollapseDescriptor<TDocument>> CollapseDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor<TDocument> DocvalueFieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>> DocvalueFieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>>[] DocvalueFieldsDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? FieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor<TDocument> FieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>> FieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>>[] FieldsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Highlight? HighlightValue { get; set; }
-
 	private Core.Search.HighlightDescriptor<TDocument> HighlightDescriptor { get; set; }
-
 	private Action<Core.Search.HighlightDescriptor<TDocument>> HighlightDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }
-
 	private KnnQueryDescriptor<TDocument> KnnDescriptor { get; set; }
-
 	private Action<KnnQueryDescriptor<TDocument>> KnnDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> PostFilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> PostFilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>? RescoreValue { get; set; }
-
 	private Core.Search.RescoreDescriptor<TDocument> RescoreDescriptor { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor<TDocument>> RescoreDescriptorAction { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor<TDocument>>[] RescoreDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; }
-
 	private SlicedScrollDescriptor<TDocument> SliceDescriptor { get; set; }
-
 	private Action<SlicedScrollDescriptor<TDocument>> SliceDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor<TDocument> SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private bool? ExplainValue { get; set; }
-
 	private IDictionary<string, object>? ExtValue { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? IndicesBoostValue { get; set; }
-
 	private double? MinScoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? PitValue { get; set; }
-
 	private Core.Search.PointInTimeReferenceDescriptor PitDescriptor { get; set; }
-
 	private Action<Core.Search.PointInTimeReferenceDescriptor> PitDescriptorAction { get; set; }
-
 	private bool? ProfileValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFieldsValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfterValue { get; set; }
-
 	private bool? SeqNoPrimaryTermValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private ICollection<string>? StatsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Suggester? SuggestValue { get; set; }
-
 	private Core.Search.SuggesterDescriptor SuggestDescriptor { get; set; }
-
 	private Action<Core.Search.SuggesterDescriptor> SuggestDescriptorAction { get; set; }
-
 	private long? TerminateAfterValue { get; set; }
-
 	private string? TimeoutValue { get; set; }
-
 	private bool? TrackScoresValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHitsValue { get; set; }
-
 	private bool? VersionValue { get; set; }
 
 	public SearchRequestDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -951,6 +1110,9 @@ public SearchRequestDescriptor<TDocument> Collapse(Action<Core.Search.FieldColla
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns doc values for field<br/>names matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> DocvalueFields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? docvalueFields)
 	{
 		DocvalueFieldsDescriptor = null;
@@ -987,6 +1149,9 @@ public SearchRequestDescriptor<TDocument> DocvalueFields(params Action<QueryDsl.
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns values for field names<br/>matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> Fields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? fields)
 	{
 		FieldsDescriptor = null;
@@ -1047,6 +1212,9 @@ public SearchRequestDescriptor<TDocument> Highlight(Action<Core.Search.Highlight
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the approximate kNN search to run.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
 	{
 		KnnDescriptor = null;
@@ -1095,6 +1263,9 @@ public SearchRequestDescriptor<TDocument> PostFilter(Action<QueryDsl.QueryDescri
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the search definition using the Query DSL.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
 	{
 		QueryDescriptor = null;
@@ -1215,42 +1386,63 @@ public SearchRequestDescriptor<TDocument> Sort(params Action<SortOptionsDescript
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Indicates which source fields are returned for matching documents. These<br/>fields are returned in the hits._source property of the search response.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source)
 	{
 		SourceValue = source;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns detailed information about score computation as part of a hit.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> Explain(bool? explain = true)
 	{
 		ExplainValue = explain;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Configuration of search extensions defined by Elasticsearch plugins.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> Ext(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		ExtValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Starting document offset. By default, you cannot page through more than 10,000<br/>hits using the from and size parameters. To page through more hits, use the<br/>search_after parameter.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> From(int? from)
 	{
 		FromValue = from;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Boosts the _score of documents from specified indices.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> IndicesBoost(ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? indicesBoost)
 	{
 		IndicesBoostValue = indicesBoost;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Minimum _score for matching documents. Documents with a lower _score are<br/>not included in the search results.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> MinScore(double? minScore)
 	{
 		MinScoreValue = minScore;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Limits the search to a point in time (PIT). If you provide a PIT, you<br/>cannot specify an <index> in the request path.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> Pit(Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? pit)
 	{
 		PitDescriptor = null;
@@ -1281,12 +1473,18 @@ public SearchRequestDescriptor<TDocument> Profile(bool? profile = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> RuntimeMappings(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeMappingsValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Retrieve a script evaluation (based on different fields) for each hit.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> ScriptFields(Func<FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>, FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>> selector)
 	{
 		ScriptFieldsValue = selector?.Invoke(new FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>());
@@ -1299,24 +1497,36 @@ public SearchRequestDescriptor<TDocument> SearchAfter(ICollection<Elastic.Client
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns sequence number and primary term of the last modification<br/>of each hit. See Optimistic concurrency control.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> SeqNoPrimaryTerm(bool? seqNoPrimaryTerm = true)
 	{
 		SeqNoPrimaryTermValue = seqNoPrimaryTerm;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The number of hits to return. By default, you cannot page through more<br/>than 10,000 hits using the from and size parameters. To page through more<br/>hits, use the search_after parameter.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> Size(int? size)
 	{
 		SizeValue = size;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Stats groups to associate with the search. Each group maintains a statistics<br/>aggregation for its associated searches. You can retrieve these stats using<br/>the indices stats API.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> Stats(ICollection<string>? stats)
 	{
 		StatsValue = stats;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>List of stored fields to return as part of a hit. If no fields are specified,<br/>no stored fields are included in the response. If this field is specified, the _source<br/>parameter defaults to false. You can pass _source: true to return both source fields<br/>and stored fields in the search response.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields)
 	{
 		StoredFieldsValue = storedFields;
@@ -1347,30 +1557,45 @@ public SearchRequestDescriptor<TDocument> Suggest(Action<Core.Search.SuggesterDe
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Maximum number of documents to collect for each shard. If a query reaches this<br/>limit, Elasticsearch terminates the query early. Elasticsearch collects documents<br/>before sorting. Defaults to 0, which does not terminate query execution early.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> TerminateAfter(long? terminateAfter)
 	{
 		TerminateAfterValue = terminateAfter;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the period of time to wait for a response from each shard. If no response<br/>is received before the timeout expires, the request fails and returns an error.<br/>Defaults to no timeout.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> Timeout(string? timeout)
 	{
 		TimeoutValue = timeout;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, calculate and return document scores, even if the scores are not used for sorting.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> TrackScores(bool? trackScores = true)
 	{
 		TrackScoresValue = trackScores;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Number of hits matching the query to count accurately. If true, the exact<br/>number of hits is returned at the cost of some performance. If false, the<br/>response does not include the total number of hits matching the query.<br/>Defaults to 10,000 hits.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> TrackTotalHits(Elastic.Clients.Elasticsearch.Core.Search.TrackHits? trackTotalHits)
 	{
 		TrackTotalHitsValue = trackTotalHits;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns document version as part of a hit.</para>
+	/// </summary>
 	public SearchRequestDescriptor<TDocument> Version(bool? version = true)
 	{
 		VersionValue = version;
@@ -1762,9 +1987,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns results matching a query.</para>
+/// </summary>
 public sealed partial class SearchRequestDescriptor : RequestDescriptor<SearchRequestDescriptor, SearchRequestParameters>
 {
 	internal SearchRequestDescriptor(Action<SearchRequestDescriptor> configure) => configure.Invoke(this);
+
 	public SearchRequestDescriptor(Elasticsearch.Indices? indices) : base(r => r.Optional("index", indices))
 	{
 	}
@@ -1773,9 +2002,12 @@ public SearchRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceSearch;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceSearch;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public SearchRequestDescriptor SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public SearchRequestDescriptor SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
 	public SearchRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
@@ -1805,6 +2037,7 @@ public SearchRequestDescriptor()
 	public SearchRequestDescriptor SuggestSize(long? suggestSize) => Qs("suggest_size", suggestSize);
 	public SearchRequestDescriptor SuggestText(string? suggestText) => Qs("suggest_text", suggestText);
 	public SearchRequestDescriptor TypedKeys(bool? typedKeys = true) => Qs("typed_keys", typedKeys);
+
 	public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -1812,127 +2045,66 @@ public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? in
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; }
-
 	private Core.Search.FieldCollapseDescriptor CollapseDescriptor { get; set; }
-
 	private Action<Core.Search.FieldCollapseDescriptor> CollapseDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor DocvalueFieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor> DocvalueFieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor>[] DocvalueFieldsDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? FieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor FieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor> FieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor>[] FieldsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Highlight? HighlightValue { get; set; }
-
 	private Core.Search.HighlightDescriptor HighlightDescriptor { get; set; }
-
 	private Action<Core.Search.HighlightDescriptor> HighlightDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }
-
 	private KnnQueryDescriptor KnnDescriptor { get; set; }
-
 	private Action<KnnQueryDescriptor> KnnDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor PostFilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> PostFilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>? RescoreValue { get; set; }
-
 	private Core.Search.RescoreDescriptor RescoreDescriptor { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor> RescoreDescriptorAction { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor>[] RescoreDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; }
-
 	private SlicedScrollDescriptor SliceDescriptor { get; set; }
-
 	private Action<SlicedScrollDescriptor> SliceDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private bool? ExplainValue { get; set; }
-
 	private IDictionary<string, object>? ExtValue { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? IndicesBoostValue { get; set; }
-
 	private double? MinScoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? PitValue { get; set; }
-
 	private Core.Search.PointInTimeReferenceDescriptor PitDescriptor { get; set; }
-
 	private Action<Core.Search.PointInTimeReferenceDescriptor> PitDescriptorAction { get; set; }
-
 	private bool? ProfileValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFieldsValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfterValue { get; set; }
-
 	private bool? SeqNoPrimaryTermValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private ICollection<string>? StatsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Suggester? SuggestValue { get; set; }
-
 	private Core.Search.SuggesterDescriptor SuggestDescriptor { get; set; }
-
 	private Action<Core.Search.SuggesterDescriptor> SuggestDescriptorAction { get; set; }
-
 	private long? TerminateAfterValue { get; set; }
-
 	private string? TimeoutValue { get; set; }
-
 	private bool? TrackScoresValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHitsValue { get; set; }
-
 	private bool? VersionValue { get; set; }
 
 	public SearchRequestDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -1983,6 +2155,9 @@ public SearchRequestDescriptor Collapse(Action<Core.Search.FieldCollapseDescript
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns doc values for field<br/>names matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public SearchRequestDescriptor DocvalueFields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? docvalueFields)
 	{
 		DocvalueFieldsDescriptor = null;
@@ -2019,6 +2194,9 @@ public SearchRequestDescriptor DocvalueFields(params Action<QueryDsl.FieldAndFor
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns values for field names<br/>matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public SearchRequestDescriptor Fields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? fields)
 	{
 		FieldsDescriptor = null;
@@ -2079,6 +2257,9 @@ public SearchRequestDescriptor Highlight(Action<Core.Search.HighlightDescriptor>
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the approximate kNN search to run.</para>
+	/// </summary>
 	public SearchRequestDescriptor Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
 	{
 		KnnDescriptor = null;
@@ -2127,6 +2308,9 @@ public SearchRequestDescriptor PostFilter(Action<QueryDsl.QueryDescriptor> confi
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the search definition using the Query DSL.</para>
+	/// </summary>
 	public SearchRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
 	{
 		QueryDescriptor = null;
@@ -2247,42 +2431,63 @@ public SearchRequestDescriptor Sort(params Action<SortOptionsDescriptor>[] confi
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Indicates which source fields are returned for matching documents. These<br/>fields are returned in the hits._source property of the search response.</para>
+	/// </summary>
 	public SearchRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source)
 	{
 		SourceValue = source;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns detailed information about score computation as part of a hit.</para>
+	/// </summary>
 	public SearchRequestDescriptor Explain(bool? explain = true)
 	{
 		ExplainValue = explain;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Configuration of search extensions defined by Elasticsearch plugins.</para>
+	/// </summary>
 	public SearchRequestDescriptor Ext(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		ExtValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Starting document offset. By default, you cannot page through more than 10,000<br/>hits using the from and size parameters. To page through more hits, use the<br/>search_after parameter.</para>
+	/// </summary>
 	public SearchRequestDescriptor From(int? from)
 	{
 		FromValue = from;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Boosts the _score of documents from specified indices.</para>
+	/// </summary>
 	public SearchRequestDescriptor IndicesBoost(ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? indicesBoost)
 	{
 		IndicesBoostValue = indicesBoost;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Minimum _score for matching documents. Documents with a lower _score are<br/>not included in the search results.</para>
+	/// </summary>
 	public SearchRequestDescriptor MinScore(double? minScore)
 	{
 		MinScoreValue = minScore;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Limits the search to a point in time (PIT). If you provide a PIT, you<br/>cannot specify an <index> in the request path.</para>
+	/// </summary>
 	public SearchRequestDescriptor Pit(Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? pit)
 	{
 		PitDescriptor = null;
@@ -2313,12 +2518,18 @@ public SearchRequestDescriptor Profile(bool? profile = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	public SearchRequestDescriptor RuntimeMappings(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeMappingsValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Retrieve a script evaluation (based on different fields) for each hit.</para>
+	/// </summary>
 	public SearchRequestDescriptor ScriptFields(Func<FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>, FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>> selector)
 	{
 		ScriptFieldsValue = selector?.Invoke(new FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>());
@@ -2331,24 +2542,36 @@ public SearchRequestDescriptor SearchAfter(ICollection<Elastic.Clients.Elasticse
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns sequence number and primary term of the last modification<br/>of each hit. See Optimistic concurrency control.</para>
+	/// </summary>
 	public SearchRequestDescriptor SeqNoPrimaryTerm(bool? seqNoPrimaryTerm = true)
 	{
 		SeqNoPrimaryTermValue = seqNoPrimaryTerm;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The number of hits to return. By default, you cannot page through more<br/>than 10,000 hits using the from and size parameters. To page through more<br/>hits, use the search_after parameter.</para>
+	/// </summary>
 	public SearchRequestDescriptor Size(int? size)
 	{
 		SizeValue = size;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Stats groups to associate with the search. Each group maintains a statistics<br/>aggregation for its associated searches. You can retrieve these stats using<br/>the indices stats API.</para>
+	/// </summary>
 	public SearchRequestDescriptor Stats(ICollection<string>? stats)
 	{
 		StatsValue = stats;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>List of stored fields to return as part of a hit. If no fields are specified,<br/>no stored fields are included in the response. If this field is specified, the _source<br/>parameter defaults to false. You can pass _source: true to return both source fields<br/>and stored fields in the search response.</para>
+	/// </summary>
 	public SearchRequestDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields)
 	{
 		StoredFieldsValue = storedFields;
@@ -2379,30 +2602,45 @@ public SearchRequestDescriptor Suggest(Action<Core.Search.SuggesterDescriptor> c
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Maximum number of documents to collect for each shard. If a query reaches this<br/>limit, Elasticsearch terminates the query early. Elasticsearch collects documents<br/>before sorting. Defaults to 0, which does not terminate query execution early.</para>
+	/// </summary>
 	public SearchRequestDescriptor TerminateAfter(long? terminateAfter)
 	{
 		TerminateAfterValue = terminateAfter;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the period of time to wait for a response from each shard. If no response<br/>is received before the timeout expires, the request fails and returns an error.<br/>Defaults to no timeout.</para>
+	/// </summary>
 	public SearchRequestDescriptor Timeout(string? timeout)
 	{
 		TimeoutValue = timeout;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, calculate and return document scores, even if the scores are not used for sorting.</para>
+	/// </summary>
 	public SearchRequestDescriptor TrackScores(bool? trackScores = true)
 	{
 		TrackScoresValue = trackScores;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Number of hits matching the query to count accurately. If true, the exact<br/>number of hits is returned at the cost of some performance. If false, the<br/>response does not include the total number of hits matching the query.<br/>Defaults to 10,000 hits.</para>
+	/// </summary>
 	public SearchRequestDescriptor TrackTotalHits(Elastic.Clients.Elasticsearch.Core.Search.TrackHits? trackTotalHits)
 	{
 		TrackTotalHitsValue = trackTotalHits;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns document version as part of a hit.</para>
+	/// </summary>
 	public SearchRequestDescriptor Version(bool? version = true)
 	{
 		VersionValue = version;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchResponse.g.cs
index 9e8940967a0..b3a8f8b3647 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchResponse.g.cs
@@ -15,52 +15,42 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class SearchResponse<TDocument> : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary? Aggregations { get; init; }
-
 	[JsonInclude, JsonPropertyName("_clusters")]
 	public Elastic.Clients.Elasticsearch.ClusterStatistics? Clusters { get; init; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<TDocument> HitsMetadata { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_score")]
 	public double? MaxScore { get; init; }
-
 	[JsonInclude, JsonPropertyName("num_reduce_phases")]
 	public long? NumReducePhases { get; init; }
-
 	[JsonInclude, JsonPropertyName("pit_id")]
 	public string? PitId { get; init; }
-
 	[JsonInclude, JsonPropertyName("profile")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Profile? Profile { get; init; }
-
 	[JsonInclude, JsonPropertyName("_scroll_id")]
 	public Elastic.Clients.Elasticsearch.ScrollId? ScrollId { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("terminated_early")]
 	public bool? TerminatedEarly { get; init; }
-
 	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool TimedOut { get; init; }
-
 	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchShardsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchShardsRequest.g.cs
index 86d59d9ffb9..1486094518c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchShardsRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchShardsRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,29 +27,44 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class SearchShardsRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 }
 
+/// <summary>
+/// <para>Returns information about the indices and shards that a search request would be executed against.</para>
+/// </summary>
 public sealed partial class SearchShardsRequest : PlainRequest<SearchShardsRequestParameters>
 {
 	public SearchShardsRequest()
@@ -58,44 +75,73 @@ public SearchShardsRequest(Elastic.Clients.Elasticsearch.Indices? indices) : bas
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceSearchShards;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceSearchShards;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Return local information, do not retrieve the state from master node (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Local { get => Q<bool?>("local"); set => Q("local", value); }
 
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>Specific routing value</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 }
 
+/// <summary>
+/// <para>Returns information about the indices and shards that a search request would be executed against.</para>
+/// </summary>
 public sealed partial class SearchShardsRequestDescriptor<TDocument> : RequestDescriptor<SearchShardsRequestDescriptor<TDocument>, SearchShardsRequestParameters>
 {
 	internal SearchShardsRequestDescriptor(Action<SearchShardsRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SearchShardsRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceSearchShards;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceSearchShards;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public SearchShardsRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public SearchShardsRequestDescriptor<TDocument> ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public SearchShardsRequestDescriptor<TDocument> IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public SearchShardsRequestDescriptor<TDocument> Local(bool? local = true) => Qs("local", local);
 	public SearchShardsRequestDescriptor<TDocument> Preference(string? preference) => Qs("preference", preference);
 	public SearchShardsRequestDescriptor<TDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
+
 	public SearchShardsRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
@@ -107,22 +153,30 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns information about the indices and shards that a search request would be executed against.</para>
+/// </summary>
 public sealed partial class SearchShardsRequestDescriptor : RequestDescriptor<SearchShardsRequestDescriptor, SearchShardsRequestParameters>
 {
 	internal SearchShardsRequestDescriptor(Action<SearchShardsRequestDescriptor> configure) => configure.Invoke(this);
+
 	public SearchShardsRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceSearchShards;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceSearchShards;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	public SearchShardsRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public SearchShardsRequestDescriptor ExpandWildcards(ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? expandWildcards) => Qs("expand_wildcards", expandWildcards);
 	public SearchShardsRequestDescriptor IgnoreUnavailable(bool? ignoreUnavailable = true) => Qs("ignore_unavailable", ignoreUnavailable);
 	public SearchShardsRequestDescriptor Local(bool? local = true) => Qs("local", local);
 	public SearchShardsRequestDescriptor Preference(string? preference) => Qs("preference", preference);
 	public SearchShardsRequestDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
+
 	public SearchShardsRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? indices)
 	{
 		RouteValues.Optional("index", indices);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchShardsResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchShardsResponse.g.cs
index 7a0376231bb..e473ccd0c0e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchShardsResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchShardsResponse.g.cs
@@ -15,23 +15,23 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class SearchShardsResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("indices")]
 	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.Core.SearchShards.ShardStoreIndex))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.Core.SearchShards.ShardStoreIndex> Indices { get; init; }
-
 	[JsonInclude, JsonPropertyName("nodes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.NodeAttributes> Nodes { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards")]
 	public IReadOnlyCollection<IReadOnlyCollection<Elastic.Clients.Elasticsearch.NodeShard>> Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorRequest.g.cs
index e7dfffa6335..25de0408e4f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,31 +27,44 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public sealed class ClearCursorRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Clears the SQL cursor</para>
+/// </summary>
 public sealed partial class ClearCursorRequest : PlainRequest<ClearCursorRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlClearCursor;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlClearCursor;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	[JsonInclude, JsonPropertyName("cursor")]
 	public string Cursor { get; set; }
 }
 
+/// <summary>
+/// <para>Clears the SQL cursor</para>
+/// </summary>
 public sealed partial class ClearCursorRequestDescriptor : RequestDescriptor<ClearCursorRequestDescriptor, ClearCursorRequestParameters>
 {
 	internal ClearCursorRequestDescriptor(Action<ClearCursorRequestDescriptor> configure) => configure.Invoke(this);
+
 	public ClearCursorRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlClearCursor;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlClearCursor;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	private string CursorValue { get; set; }
 
 	public ClearCursorRequestDescriptor Cursor(string cursor)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorResponse.g.cs
index 541cde22535..0e45262a6b7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/ClearCursorResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public sealed partial class ClearCursorResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("succeeded")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncRequest.g.cs
index e545e34bbf1..9d2e94f4a82 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,26 +27,35 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public sealed class DeleteAsyncRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Deletes an async SQL search or a stored synchronous SQL search. If the search is still running, the API cancels it.</para>
+/// </summary>
 public sealed partial class DeleteAsyncRequest : PlainRequest<DeleteAsyncRequestParameters>
 {
 	public DeleteAsyncRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlDeleteAsync;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlDeleteAsync;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Deletes an async SQL search or a stored synchronous SQL search. If the search is still running, the API cancels it.</para>
+/// </summary>
 public sealed partial class DeleteAsyncRequestDescriptor<TDocument> : RequestDescriptor<DeleteAsyncRequestDescriptor<TDocument>, DeleteAsyncRequestParameters>
 {
 	internal DeleteAsyncRequestDescriptor(Action<DeleteAsyncRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DeleteAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -53,9 +64,12 @@ internal DeleteAsyncRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlDeleteAsync;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlDeleteAsync;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public DeleteAsyncRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -67,9 +81,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Deletes an async SQL search or a stored synchronous SQL search. If the search is still running, the API cancels it.</para>
+/// </summary>
 public sealed partial class DeleteAsyncRequestDescriptor : RequestDescriptor<DeleteAsyncRequestDescriptor, DeleteAsyncRequestParameters>
 {
 	internal DeleteAsyncRequestDescriptor(Action<DeleteAsyncRequestDescriptor> configure) => configure.Invoke(this);
+
 	public DeleteAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -78,9 +96,12 @@ internal DeleteAsyncRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlDeleteAsync;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlDeleteAsync;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.DELETE;
+
 	internal override bool SupportsBody => false;
+
 	public DeleteAsyncRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncResponse.g.cs
index df0d7324626..eb45e0020a0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/DeleteAsyncResponse.g.cs
@@ -15,16 +15,21 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public sealed partial class DeleteAsyncResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>For a successful response, this value is always true. On failure, an exception is returned instead.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("acknowledged")]
 	public bool Acknowledged { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncRequest.g.cs
index 8f29fff7ce2..d9016504ab1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,48 +27,78 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public sealed class GetAsyncRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Separator for CSV results. The API only supports this parameter for CSV responses.</para>
+	/// </summary>
 	public string? Delimiter { get => Q<string?>("delimiter"); set => Q("delimiter", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Format for the response. You must specify a format using this parameter or the<br/>Accept HTTP header. If you specify both, the API uses this parameter.</para>
+	/// </summary>
 	public string? Format { get => Q<string?>("format"); set => Q("format", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Retention period for the search and its results. Defaults<br/>to the `keep_alive` period for the original SQL search.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for complete results. Defaults to no timeout,<br/>meaning the request waits for complete search results.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns the current status and available results for an async SQL search or stored synchronous SQL search</para>
+/// </summary>
 public sealed partial class GetAsyncRequest : PlainRequest<GetAsyncRequestParameters>
 {
 	public GetAsyncRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlGetAsync;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlGetAsync;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>Separator for CSV results. The API only supports this parameter for CSV responses.</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Delimiter { get => Q<string?>("delimiter"); set => Q("delimiter", value); }
 
+	/// <summary>
+	/// <para>Format for the response. You must specify a format using this parameter or the<br/>Accept HTTP header. If you specify both, the API uses this parameter.</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Format { get => Q<string?>("format"); set => Q("format", value); }
 
+	/// <summary>
+	/// <para>Retention period for the search and its results. Defaults<br/>to the `keep_alive` period for the original SQL search.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get => Q<Elastic.Clients.Elasticsearch.Duration?>("keep_alive"); set => Q("keep_alive", value); }
 
+	/// <summary>
+	/// <para>Period to wait for complete results. Defaults to no timeout,<br/>meaning the request waits for complete search results.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("wait_for_completion_timeout"); set => Q("wait_for_completion_timeout", value); }
 }
 
+/// <summary>
+/// <para>Returns the current status and available results for an async SQL search or stored synchronous SQL search</para>
+/// </summary>
 public sealed partial class GetAsyncRequestDescriptor<TDocument> : RequestDescriptor<GetAsyncRequestDescriptor<TDocument>, GetAsyncRequestParameters>
 {
 	internal GetAsyncRequestDescriptor(Action<GetAsyncRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -75,13 +107,17 @@ internal GetAsyncRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlGetAsync;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlGetAsync;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetAsyncRequestDescriptor<TDocument> Delimiter(string? delimiter) => Qs("delimiter", delimiter);
 	public GetAsyncRequestDescriptor<TDocument> Format(string? format) => Qs("format", format);
 	public GetAsyncRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
 	public GetAsyncRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+
 	public GetAsyncRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -93,9 +129,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns the current status and available results for an async SQL search or stored synchronous SQL search</para>
+/// </summary>
 public sealed partial class GetAsyncRequestDescriptor : RequestDescriptor<GetAsyncRequestDescriptor, GetAsyncRequestParameters>
 {
 	internal GetAsyncRequestDescriptor(Action<GetAsyncRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetAsyncRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -104,13 +144,17 @@ internal GetAsyncRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlGetAsync;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlGetAsync;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetAsyncRequestDescriptor Delimiter(string? delimiter) => Qs("delimiter", delimiter);
 	public GetAsyncRequestDescriptor Format(string? format) => Qs("format", format);
 	public GetAsyncRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive) => Qs("keep_alive", keepAlive);
 	public GetAsyncRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout) => Qs("wait_for_completion_timeout", waitForCompletionTimeout);
+
 	public GetAsyncRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncResponse.g.cs
index d512479bd78..b24e925c088 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncResponse.g.cs
@@ -15,28 +15,45 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public sealed partial class GetAsyncResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>Column headings for the search results. Each object is a column.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("columns")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Sql.Column>? Columns { get; init; }
 
+	/// <summary>
+	/// <para>Cursor for the next set of paginated results. For CSV, TSV, and<br/>TXT responses, this value is returned in the `Cursor` HTTP header.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("cursor")]
 	public string? Cursor { get; init; }
 
+	/// <summary>
+	/// <para>Identifier for the search. This value is only returned for async and saved<br/>synchronous searches. For CSV, TSV, and TXT responses, this value is returned<br/>in the `Async-ID` HTTP header.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
+	/// <summary>
+	/// <para>If `true`, the response does not contain complete search results. If `is_partial`<br/>is `true` and `is_running` is `true`, the search is still running. If `is_partial`<br/>is `true` but `is_running` is `false`, the results are partial due to a failure or<br/>timeout. This value is only returned for async and saved synchronous searches.<br/>For CSV, TSV, and TXT responses, this value is returned in the `Async-partial` HTTP header.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
+	/// <summary>
+	/// <para>If `true`, the search is still running. If false, the search has finished.<br/>This value is only returned for async and saved synchronous searches. For<br/>CSV, TSV, and TXT responses, this value is returned in the `Async-partial`<br/>HTTP header.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusRequest.g.cs
index 09a0c7ebfbd..5e60666beb9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,26 +27,35 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public sealed class GetAsyncStatusRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Returns the current status of an async SQL search or a stored synchronous SQL search</para>
+/// </summary>
 public sealed partial class GetAsyncStatusRequest : PlainRequest<GetAsyncStatusRequestParameters>
 {
 	public GetAsyncStatusRequest(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlGetAsyncStatus;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlGetAsyncStatus;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
 }
 
+/// <summary>
+/// <para>Returns the current status of an async SQL search or a stored synchronous SQL search</para>
+/// </summary>
 public sealed partial class GetAsyncStatusRequestDescriptor<TDocument> : RequestDescriptor<GetAsyncStatusRequestDescriptor<TDocument>, GetAsyncStatusRequestParameters>
 {
 	internal GetAsyncStatusRequestDescriptor(Action<GetAsyncStatusRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GetAsyncStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -53,9 +64,12 @@ internal GetAsyncStatusRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlGetAsyncStatus;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlGetAsyncStatus;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetAsyncStatusRequestDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
@@ -67,9 +81,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Returns the current status of an async SQL search or a stored synchronous SQL search</para>
+/// </summary>
 public sealed partial class GetAsyncStatusRequestDescriptor : RequestDescriptor<GetAsyncStatusRequestDescriptor, GetAsyncStatusRequestParameters>
 {
 	internal GetAsyncStatusRequestDescriptor(Action<GetAsyncStatusRequestDescriptor> configure) => configure.Invoke(this);
+
 	public GetAsyncStatusRequestDescriptor(Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("id", id))
 	{
 	}
@@ -78,9 +96,12 @@ internal GetAsyncStatusRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlGetAsyncStatus;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlGetAsyncStatus;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.GET;
+
 	internal override bool SupportsBody => false;
+
 	public GetAsyncStatusRequestDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		RouteValues.Required("id", id);
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs
index dbd0fae037d..21d47b47c46 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/GetAsyncStatusResponse.g.cs
@@ -15,31 +15,51 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public sealed partial class GetAsyncStatusResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>HTTP status code for the search. The API only returns this property for completed searches.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("completion_status")]
 	public int? CompletionStatus { get; init; }
 
+	/// <summary>
+	/// <para>Timestamp, in milliseconds since the Unix epoch, when Elasticsearch will delete<br/>the search and its results, even if the search is still running.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("expiration_time_in_millis")]
 	public long ExpirationTimeInMillis { get; init; }
 
+	/// <summary>
+	/// <para>Identifier for the search.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
 
+	/// <summary>
+	/// <para>If `true`, the response does not contain complete search results. If `is_partial`<br/>is `true` and `is_running` is `true`, the search is still running. If `is_partial`<br/>is `true` but `is_running` is `false`, the results are partial due to a failure or<br/>timeout.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool IsPartial { get; init; }
 
+	/// <summary>
+	/// <para>If `true`, the search is still running. If `false`, the search has finished.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_running")]
 	public bool IsRunning { get; init; }
 
+	/// <summary>
+	/// <para>Timestamp, in milliseconds since the Unix epoch, when the search started.<br/>The API only returns this property for running searches.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("start_time_in_millis")]
 	public long StartTimeInMillis { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryRequest.g.cs
index a83437f7b2a..cee61880a6e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,112 +27,151 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public sealed class QueryRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>Executes a SQL request</para>
+/// </summary>
 public sealed partial class QueryRequest : PlainRequest<QueryRequestParameters>
 {
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlQuery;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlQuery;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Default catalog (cluster) for queries. If unspecified, the queries execute on the data in the local cluster only.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("catalog")]
 	public string? Catalog { get; set; }
-
 	[JsonInclude, JsonPropertyName("columnar")]
 	public bool? Columnar { get; set; }
-
 	[JsonInclude, JsonPropertyName("cursor")]
 	public string? Cursor { get; set; }
 
+	/// <summary>
+	/// <para>The maximum number of rows (or entries) to return in one response</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("fetch_size")]
 	public int? FetchSize { get; set; }
 
+	/// <summary>
+	/// <para>Optional Elasticsearch query DSL for additional filtering.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; }
 
+	/// <summary>
+	/// <para>SQL query to execute</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("query")]
 	public string? Query { get; set; }
 
+	/// <summary>
+	/// <para>The timeout before the request fails.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("request_timeout")]
 	public Elastic.Clients.Elasticsearch.Duration? RequestTimeout { get; set; }
 
+	/// <summary>
+	/// <para>The timeout before a pagination request fails.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("page_timeout")]
 	public Elastic.Clients.Elasticsearch.Duration? PageTimeout { get; set; }
 
+	/// <summary>
+	/// <para>Time-zone in ISO 8601 used for executing the query on the server. More information available here.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("time_zone")]
 	public string? TimeZone { get; set; }
 
+	/// <summary>
+	/// <para>Throw an exception when encountering multiple values for a field (default) or be lenient and return the first value from the list (without any guarantees of what that will be - typically the first in natural ascending order).</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("field_multi_value_leniency")]
 	public bool? FieldMultiValueLeniency { get; set; }
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
+	/// <summary>
+	/// <para>Period to wait for complete results. Defaults to no timeout, meaning the request waits for complete search results. If the search doesn’t finish within this period, the search becomes async.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("wait_for_completion_timeout")]
 	public Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeout { get; set; }
 
+	/// <summary>
+	/// <para>Values for parameters in the query.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("params")]
 	public IDictionary<string, object>? Params { get; set; }
 
+	/// <summary>
+	/// <para>Retention period for an async or saved synchronous search.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("keep_alive")]
 	public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get; set; }
 
+	/// <summary>
+	/// <para>If true, Elasticsearch stores synchronous searches if you also specify the wait_for_completion_timeout parameter. If false, Elasticsearch only stores async searches that don’t finish before the wait_for_completion_timeout.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("keep_on_completion")]
 	public bool? KeepOnCompletion { get; set; }
 
+	/// <summary>
+	/// <para>If true, the search can run on frozen indices. Defaults to false.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("index_using_frozen")]
 	public bool? IndexUsingFrozen { get; set; }
 }
 
+/// <summary>
+/// <para>Executes a SQL request</para>
+/// </summary>
 public sealed partial class QueryRequestDescriptor<TDocument> : RequestDescriptor<QueryRequestDescriptor<TDocument>, QueryRequestParameters>
 {
 	internal QueryRequestDescriptor(Action<QueryRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public QueryRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlQuery;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlQuery;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
-	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
 
+	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
 	private QueryDsl.QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private string? CatalogValue { get; set; }
-
 	private bool? ColumnarValue { get; set; }
-
 	private string? CursorValue { get; set; }
-
 	private int? FetchSizeValue { get; set; }
-
 	private bool? FieldMultiValueLeniencyValue { get; set; }
-
 	private bool? IndexUsingFrozenValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? KeepAliveValue { get; set; }
-
 	private bool? KeepOnCompletionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? PageTimeoutValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private string? QueryValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? RequestTimeoutValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private string? TimeZoneValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeoutValue { get; set; }
 
+	/// <summary>
+	/// <para>Optional Elasticsearch query DSL for additional filtering.</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
 	{
 		FilterDescriptor = null;
@@ -155,6 +196,9 @@ public QueryRequestDescriptor<TDocument> Filter(Action<QueryDsl.QueryDescriptor<
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Default catalog (cluster) for queries. If unspecified, the queries execute on the data in the local cluster only.</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> Catalog(string? catalog)
 	{
 		CatalogValue = catalog;
@@ -173,72 +217,108 @@ public QueryRequestDescriptor<TDocument> Cursor(string? cursor)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The maximum number of rows (or entries) to return in one response</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> FetchSize(int? fetchSize)
 	{
 		FetchSizeValue = fetchSize;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Throw an exception when encountering multiple values for a field (default) or be lenient and return the first value from the list (without any guarantees of what that will be - typically the first in natural ascending order).</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> FieldMultiValueLeniency(bool? fieldMultiValueLeniency = true)
 	{
 		FieldMultiValueLeniencyValue = fieldMultiValueLeniency;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, the search can run on frozen indices. Defaults to false.</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> IndexUsingFrozen(bool? indexUsingFrozen = true)
 	{
 		IndexUsingFrozenValue = indexUsingFrozen;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Retention period for an async or saved synchronous search.</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive)
 	{
 		KeepAliveValue = keepAlive;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, Elasticsearch stores synchronous searches if you also specify the wait_for_completion_timeout parameter. If false, Elasticsearch only stores async searches that don’t finish before the wait_for_completion_timeout.</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> KeepOnCompletion(bool? keepOnCompletion = true)
 	{
 		KeepOnCompletionValue = keepOnCompletion;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The timeout before a pagination request fails.</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> PageTimeout(Elastic.Clients.Elasticsearch.Duration? pageTimeout)
 	{
 		PageTimeoutValue = pageTimeout;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Values for parameters in the query.</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		ParamsValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>SQL query to execute</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> Query(string? query)
 	{
 		QueryValue = query;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The timeout before the request fails.</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> RequestTimeout(Elastic.Clients.Elasticsearch.Duration? requestTimeout)
 	{
 		RequestTimeoutValue = requestTimeout;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> RuntimeMappings(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeMappingsValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Time-zone in ISO 8601 used for executing the query on the server. More information available here.</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> TimeZone(string? timeZone)
 	{
 		TimeZoneValue = timeZone;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Period to wait for complete results. Defaults to no timeout, meaning the request waits for complete search results. If the search doesn’t finish within this period, the search becomes async.</para>
+	/// </summary>
 	public QueryRequestDescriptor<TDocument> WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout)
 	{
 		WaitForCompletionTimeoutValue = waitForCompletionTimeout;
@@ -358,52 +438,45 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Executes a SQL request</para>
+/// </summary>
 public sealed partial class QueryRequestDescriptor : RequestDescriptor<QueryRequestDescriptor, QueryRequestParameters>
 {
 	internal QueryRequestDescriptor(Action<QueryRequestDescriptor> configure) => configure.Invoke(this);
+
 	public QueryRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.SqlQuery;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.SqlQuery;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
-	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
 
+	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
 	private QueryDsl.QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private string? CatalogValue { get; set; }
-
 	private bool? ColumnarValue { get; set; }
-
 	private string? CursorValue { get; set; }
-
 	private int? FetchSizeValue { get; set; }
-
 	private bool? FieldMultiValueLeniencyValue { get; set; }
-
 	private bool? IndexUsingFrozenValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? KeepAliveValue { get; set; }
-
 	private bool? KeepOnCompletionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? PageTimeoutValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private string? QueryValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? RequestTimeoutValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private string? TimeZoneValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? WaitForCompletionTimeoutValue { get; set; }
 
+	/// <summary>
+	/// <para>Optional Elasticsearch query DSL for additional filtering.</para>
+	/// </summary>
 	public QueryRequestDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
 	{
 		FilterDescriptor = null;
@@ -428,6 +501,9 @@ public QueryRequestDescriptor Filter(Action<QueryDsl.QueryDescriptor> configure)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Default catalog (cluster) for queries. If unspecified, the queries execute on the data in the local cluster only.</para>
+	/// </summary>
 	public QueryRequestDescriptor Catalog(string? catalog)
 	{
 		CatalogValue = catalog;
@@ -446,72 +522,108 @@ public QueryRequestDescriptor Cursor(string? cursor)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The maximum number of rows (or entries) to return in one response</para>
+	/// </summary>
 	public QueryRequestDescriptor FetchSize(int? fetchSize)
 	{
 		FetchSizeValue = fetchSize;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Throw an exception when encountering multiple values for a field (default) or be lenient and return the first value from the list (without any guarantees of what that will be - typically the first in natural ascending order).</para>
+	/// </summary>
 	public QueryRequestDescriptor FieldMultiValueLeniency(bool? fieldMultiValueLeniency = true)
 	{
 		FieldMultiValueLeniencyValue = fieldMultiValueLeniency;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, the search can run on frozen indices. Defaults to false.</para>
+	/// </summary>
 	public QueryRequestDescriptor IndexUsingFrozen(bool? indexUsingFrozen = true)
 	{
 		IndexUsingFrozenValue = indexUsingFrozen;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Retention period for an async or saved synchronous search.</para>
+	/// </summary>
 	public QueryRequestDescriptor KeepAlive(Elastic.Clients.Elasticsearch.Duration? keepAlive)
 	{
 		KeepAliveValue = keepAlive;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, Elasticsearch stores synchronous searches if you also specify the wait_for_completion_timeout parameter. If false, Elasticsearch only stores async searches that don’t finish before the wait_for_completion_timeout.</para>
+	/// </summary>
 	public QueryRequestDescriptor KeepOnCompletion(bool? keepOnCompletion = true)
 	{
 		KeepOnCompletionValue = keepOnCompletion;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The timeout before a pagination request fails.</para>
+	/// </summary>
 	public QueryRequestDescriptor PageTimeout(Elastic.Clients.Elasticsearch.Duration? pageTimeout)
 	{
 		PageTimeoutValue = pageTimeout;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Values for parameters in the query.</para>
+	/// </summary>
 	public QueryRequestDescriptor Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		ParamsValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>SQL query to execute</para>
+	/// </summary>
 	public QueryRequestDescriptor Query(string? query)
 	{
 		QueryValue = query;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The timeout before the request fails.</para>
+	/// </summary>
 	public QueryRequestDescriptor RequestTimeout(Elastic.Clients.Elasticsearch.Duration? requestTimeout)
 	{
 		RequestTimeoutValue = requestTimeout;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	public QueryRequestDescriptor RuntimeMappings(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeMappingsValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Time-zone in ISO 8601 used for executing the query on the server. More information available here.</para>
+	/// </summary>
 	public QueryRequestDescriptor TimeZone(string? timeZone)
 	{
 		TimeZoneValue = timeZone;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Period to wait for complete results. Defaults to no timeout, meaning the request waits for complete search results. If the search doesn’t finish within this period, the search becomes async.</para>
+	/// </summary>
 	public QueryRequestDescriptor WaitForCompletionTimeout(Elastic.Clients.Elasticsearch.Duration? waitForCompletionTimeout)
 	{
 		WaitForCompletionTimeoutValue = waitForCompletionTimeout;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryResponse.g.cs
index 3e45f0c2a41..aee3d91d37f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Sql/QueryResponse.g.cs
@@ -15,28 +15,45 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public sealed partial class QueryResponse : ElasticsearchResponse
 {
+	/// <summary>
+	/// <para>Column headings for the search results. Each object is a column.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("columns")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Sql.Column>? Columns { get; init; }
 
+	/// <summary>
+	/// <para>Cursor for the next set of paginated results. For CSV, TSV, and<br/>TXT responses, this value is returned in the `Cursor` HTTP header.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("cursor")]
 	public string? Cursor { get; init; }
 
+	/// <summary>
+	/// <para>Identifier for the search. This value is only returned for async and saved<br/>synchronous searches. For CSV, TSV, and TXT responses, this value is returned<br/>in the `Async-ID` HTTP header.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
 
+	/// <summary>
+	/// <para>If `true`, the response does not contain complete search results. If `is_partial`<br/>is `true` and `is_running` is `true`, the search is still running. If `is_partial`<br/>is `true` but `is_running` is `false`, the results are partial due to a failure or<br/>timeout. This value is only returned for async and saved synchronous searches.<br/>For CSV, TSV, and TXT responses, this value is returned in the `Async-partial` HTTP header.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_partial")]
 	public bool? IsPartial { get; init; }
 
+	/// <summary>
+	/// <para>If `true`, the search is still running. If false, the search has finished.<br/>This value is only returned for async and saved synchronous searches. For<br/>CSV, TSV, and TXT responses, this value is returned in the `Async-partial`<br/>HTTP header.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("is_running")]
 	public bool? IsRunning { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs
index d2bec37a0a6..afcc4788c32 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,46 +27,73 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class TermsEnumRequestParameters : RequestParameters
 {
 }
 
+/// <summary>
+/// <para>The terms enum API  can be used to discover terms in the index that begin with the provided string. It is designed for low-latency look-ups used in auto-complete scenarios.</para>
+/// </summary>
 public sealed partial class TermsEnumRequest : PlainRequest<TermsEnumRequestParameters>
 {
 	public TermsEnumRequest(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceTermsEnum;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceTermsEnum;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>The string to match at the start of indexed terms. If not provided, all terms in the field are considered.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
+	/// <summary>
+	/// <para>How many matching terms to return.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 
+	/// <summary>
+	/// <para>The maximum length of time to spend collecting results. Defaults to "1s" (one second). If the timeout is exceeded the complete flag set to false in the response and the results may be partial or empty.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("timeout")]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get; set; }
 
+	/// <summary>
+	/// <para>When true the provided search string is matched against index terms without case sensitivity.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("case_insensitive")]
 	public bool? CaseInsensitive { get; set; }
 
+	/// <summary>
+	/// <para>Allows to filter an index shard if the provided query rewrites to match_none.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("index_filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilter { get; set; }
 
+	/// <summary>
+	/// <para>The string after which terms in the index should be returned. Allows for a form of pagination if the last result from one request is passed as the search_after parameter for a subsequent request.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("string")]
 	public string? String { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_after")]
 	public string? SearchAfter { get; set; }
 }
 
+/// <summary>
+/// <para>The terms enum API  can be used to discover terms in the index that begin with the provided string. It is designed for low-latency look-ups used in auto-complete scenarios.</para>
+/// </summary>
 public sealed partial class TermsEnumRequestDescriptor<TDocument> : RequestDescriptor<TermsEnumRequestDescriptor<TDocument>, TermsEnumRequestParameters>
 {
 	internal TermsEnumRequestDescriptor(Action<TermsEnumRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TermsEnumRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index))
 	{
 	}
@@ -77,9 +106,12 @@ internal TermsEnumRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceTermsEnum;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceTermsEnum;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public TermsEnumRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexName index)
 	{
 		RouteValues.Required("index", index);
@@ -87,23 +119,18 @@ public TermsEnumRequestDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> IndexFilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> IndexFilterDescriptorAction { get; set; }
-
 	private bool? CaseInsensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? SearchAfterValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private string? StringValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; }
 
+	/// <summary>
+	/// <para>Allows to filter an index shard if the provided query rewrites to match_none.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor<TDocument> IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? indexFilter)
 	{
 		IndexFilterDescriptor = null;
@@ -128,18 +155,27 @@ public TermsEnumRequestDescriptor<TDocument> IndexFilter(Action<QueryDsl.QueryDe
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>When true the provided search string is matched against index terms without case sensitivity.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor<TDocument> CaseInsensitive(bool? caseInsensitive = true)
 	{
 		CaseInsensitiveValue = caseInsensitive;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The string to match at the start of indexed terms. If not provided, all terms in the field are considered.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The string to match at the start of indexed terms. If not provided, all terms in the field are considered.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor<TDocument> Field<TValue>(Expression<Func<TDocument, TValue>> field)
 	{
 		FieldValue = field;
@@ -152,18 +188,27 @@ public TermsEnumRequestDescriptor<TDocument> SearchAfter(string? searchAfter)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>How many matching terms to return.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor<TDocument> Size(int? size)
 	{
 		SizeValue = size;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The string after which terms in the index should be returned. Allows for a form of pagination if the last result from one request is passed as the search_after parameter for a subsequent request.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor<TDocument> String(string? value)
 	{
 		StringValue = value;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The maximum length of time to spend collecting results. Defaults to "1s" (one second). If the timeout is exceeded the complete flag set to false in the response and the results may be partial or empty.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor<TDocument> Timeout(Elastic.Clients.Elasticsearch.Duration? timeout)
 	{
 		TimeoutValue = timeout;
@@ -225,9 +270,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>The terms enum API  can be used to discover terms in the index that begin with the provided string. It is designed for low-latency look-ups used in auto-complete scenarios.</para>
+/// </summary>
 public sealed partial class TermsEnumRequestDescriptor : RequestDescriptor<TermsEnumRequestDescriptor, TermsEnumRequestParameters>
 {
 	internal TermsEnumRequestDescriptor(Action<TermsEnumRequestDescriptor> configure) => configure.Invoke(this);
+
 	public TermsEnumRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index) : base(r => r.Required("index", index))
 	{
 	}
@@ -236,9 +285,12 @@ internal TermsEnumRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceTermsEnum;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceTermsEnum;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public TermsEnumRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
 	{
 		RouteValues.Required("index", index);
@@ -246,23 +298,18 @@ public TermsEnumRequestDescriptor Index(Elastic.Clients.Elasticsearch.IndexName
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? IndexFilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor IndexFilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> IndexFilterDescriptorAction { get; set; }
-
 	private bool? CaseInsensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? SearchAfterValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private string? StringValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? TimeoutValue { get; set; }
 
+	/// <summary>
+	/// <para>Allows to filter an index shard if the provided query rewrites to match_none.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor IndexFilter(Elastic.Clients.Elasticsearch.QueryDsl.Query? indexFilter)
 	{
 		IndexFilterDescriptor = null;
@@ -287,24 +334,36 @@ public TermsEnumRequestDescriptor IndexFilter(Action<QueryDsl.QueryDescriptor> c
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>When true the provided search string is matched against index terms without case sensitivity.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor CaseInsensitive(bool? caseInsensitive = true)
 	{
 		CaseInsensitiveValue = caseInsensitive;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The string to match at the start of indexed terms. If not provided, all terms in the field are considered.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor Field(Elastic.Clients.Elasticsearch.Field field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The string to match at the start of indexed terms. If not provided, all terms in the field are considered.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor Field<TDocument, TValue>(Expression<Func<TDocument, TValue>> field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The string to match at the start of indexed terms. If not provided, all terms in the field are considered.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor Field<TDocument>(Expression<Func<TDocument, object>> field)
 	{
 		FieldValue = field;
@@ -317,18 +376,27 @@ public TermsEnumRequestDescriptor SearchAfter(string? searchAfter)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>How many matching terms to return.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor Size(int? size)
 	{
 		SizeValue = size;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The string after which terms in the index should be returned. Allows for a form of pagination if the last result from one request is passed as the search_after parameter for a subsequent request.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor String(string? value)
 	{
 		StringValue = value;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The maximum length of time to spend collecting results. Defaults to "1s" (one second). If the timeout is exceeded the complete flag set to false in the response and the results may be partial or empty.</para>
+	/// </summary>
 	public TermsEnumRequestDescriptor Timeout(Elastic.Clients.Elasticsearch.Duration? timeout)
 	{
 		TimeoutValue = timeout;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumResponse.g.cs
index b738e69dbe5..f83c8e7a875 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermsEnumResponse.g.cs
@@ -15,22 +15,22 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class TermsEnumResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("complete")]
 	public bool Complete { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("terms")]
 	public IReadOnlyCollection<string> Terms { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs
index 45bb0b6f00d..25aa059ea02 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,207 +27,352 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class UpdateByQueryRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The analyzer to use for the query string</para>
+	/// </summary>
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether wildcard and prefix queries should be analyzed (default: false)</para>
+	/// </summary>
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The field to use as default where no field prefix is given in the query string</para>
+	/// </summary>
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Starting offset (default: 0)</para>
+	/// </summary>
 	public long? From { get => Q<long?>("from"); set => Q("from", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Ingest pipeline to set on index requests made by this action. (default: none)</para>
+	/// </summary>
 	public string? Pipeline { get => Q<string?>("pipeline"); set => Q("pipeline", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Should the affected indexes be refreshed?</para>
+	/// </summary>
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify if request cache should be used for this request or not, defaults to index level setting</para>
+	/// </summary>
 	public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The throttle to set on this request in sub-requests per second. -1 means no throttle.</para>
+	/// </summary>
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of specific routing values</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify how long a consistent view of the index should be maintained for scrolled search</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Size on the scroll request powering the update by query</para>
+	/// </summary>
 	public long? ScrollSize { get => Q<long?>("scroll_size"); set => Q("scroll_size", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Explicit timeout for each search request. Defaults to no timeout.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("search_timeout"); set => Q("search_timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The number of slices this task should be divided into. Defaults to 1, meaning the task isn't sliced into subtasks. Can be set to `auto`.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Slices? Slices { get => Q<Elastic.Clients.Elasticsearch.Slices?>("slices"); set => Q("slices", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>A comma-separated list of <field>:<direction> pairs</para>
+	/// </summary>
 	public ICollection<string>? Sort { get => Q<ICollection<string>?>("sort"); set => Q("sort", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specific 'tag' of the request for logging and statistical purposes</para>
+	/// </summary>
 	public ICollection<string>? Stats { get => Q<ICollection<string>?>("stats"); set => Q("stats", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The maximum number of documents to collect for each shard, upon reaching which the query execution will terminate early.</para>
+	/// </summary>
 	public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Time each individual bulk request should wait for shards that are unavailable.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify whether to return document version as part of a hit</para>
+	/// </summary>
 	public bool? Version { get => Q<bool?>("version"); set => Q("version", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Should the document increment the version number (internal) on hit or not (reindex)</para>
+	/// </summary>
 	public bool? VersionType { get => Q<bool?>("version_type"); set => Q("version_type", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the update by query operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Should the request should block until the update by query operation is complete.</para>
+	/// </summary>
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
 }
 
+/// <summary>
+/// <para>Performs an update on every document in the index without changing the source,<br/>for example to pick up a mapping change.</para>
+/// </summary>
 public sealed partial class UpdateByQueryRequest : PlainRequest<UpdateByQueryRequestParameters>
 {
 	public UpdateByQueryRequest(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceUpdateByQuery;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceUpdateByQuery;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AllowNoIndices { get => Q<bool?>("allow_no_indices"); set => Q("allow_no_indices", value); }
 
+	/// <summary>
+	/// <para>The analyzer to use for the query string</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Analyzer { get => Q<string?>("analyzer"); set => Q("analyzer", value); }
 
+	/// <summary>
+	/// <para>Specify whether wildcard and prefix queries should be analyzed (default: false)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? AnalyzeWildcard { get => Q<bool?>("analyze_wildcard"); set => Q("analyze_wildcard", value); }
 
+	/// <summary>
+	/// <para>The default operator for query string query (AND or OR)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get => Q<Elastic.Clients.Elasticsearch.QueryDsl.Operator?>("default_operator"); set => Q("default_operator", value); }
 
+	/// <summary>
+	/// <para>The field to use as default where no field prefix is given in the query string</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Df { get => Q<string?>("df"); set => Q("df", value); }
 
+	/// <summary>
+	/// <para>Whether to expand wildcard expression to concrete indices that are open, closed or both.</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get => Q<ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>?>("expand_wildcards"); set => Q("expand_wildcards", value); }
 
+	/// <summary>
+	/// <para>Starting offset (default: 0)</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? From { get => Q<long?>("from"); set => Q("from", value); }
 
+	/// <summary>
+	/// <para>Whether specified concrete indices should be ignored when unavailable (missing or closed)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? IgnoreUnavailable { get => Q<bool?>("ignore_unavailable"); set => Q("ignore_unavailable", value); }
 
+	/// <summary>
+	/// <para>Specify whether format-based query failures (such as providing text to a numeric field) should be ignored</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Lenient { get => Q<bool?>("lenient"); set => Q("lenient", value); }
 
+	/// <summary>
+	/// <para>Ingest pipeline to set on index requests made by this action. (default: none)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Pipeline { get => Q<string?>("pipeline"); set => Q("pipeline", value); }
 
+	/// <summary>
+	/// <para>Specify the node or shard the operation should be performed on (default: random)</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Preference { get => Q<string?>("preference"); set => Q("preference", value); }
 
+	/// <summary>
+	/// <para>Should the affected indexes be refreshed?</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Refresh { get => Q<bool?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>Specify if request cache should be used for this request or not, defaults to index level setting</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? RequestCache { get => Q<bool?>("request_cache"); set => Q("request_cache", value); }
 
+	/// <summary>
+	/// <para>The throttle to set on this request in sub-requests per second. -1 means no throttle.</para>
+	/// </summary>
 	[JsonIgnore]
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of specific routing values</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>Specify how long a consistent view of the index should be maintained for scrolled search</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Scroll { get => Q<Elastic.Clients.Elasticsearch.Duration?>("scroll"); set => Q("scroll", value); }
 
+	/// <summary>
+	/// <para>Size on the scroll request powering the update by query</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? ScrollSize { get => Q<long?>("scroll_size"); set => Q("scroll_size", value); }
 
+	/// <summary>
+	/// <para>Explicit timeout for each search request. Defaults to no timeout.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? SearchTimeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("search_timeout"); set => Q("search_timeout", value); }
 
+	/// <summary>
+	/// <para>Search operation type</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get => Q<Elastic.Clients.Elasticsearch.SearchType?>("search_type"); set => Q("search_type", value); }
 
+	/// <summary>
+	/// <para>The number of slices this task should be divided into. Defaults to 1, meaning the task isn't sliced into subtasks. Can be set to `auto`.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Slices? Slices { get => Q<Elastic.Clients.Elasticsearch.Slices?>("slices"); set => Q("slices", value); }
 
+	/// <summary>
+	/// <para>A comma-separated list of <field>:<direction> pairs</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<string>? Sort { get => Q<ICollection<string>?>("sort"); set => Q("sort", value); }
 
+	/// <summary>
+	/// <para>Specific 'tag' of the request for logging and statistical purposes</para>
+	/// </summary>
 	[JsonIgnore]
 	public ICollection<string>? Stats { get => Q<ICollection<string>?>("stats"); set => Q("stats", value); }
 
+	/// <summary>
+	/// <para>The maximum number of documents to collect for each shard, upon reaching which the query execution will terminate early.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? TerminateAfter { get => Q<long?>("terminate_after"); set => Q("terminate_after", value); }
 
+	/// <summary>
+	/// <para>Time each individual bulk request should wait for shards that are unavailable.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>Specify whether to return document version as part of a hit</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? Version { get => Q<bool?>("version"); set => Q("version", value); }
 
+	/// <summary>
+	/// <para>Should the document increment the version number (internal) on hit or not (reindex)</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? VersionType { get => Q<bool?>("version_type"); set => Q("version_type", value); }
 
+	/// <summary>
+	/// <para>Sets the number of shard copies that must be active before proceeding with the update by query operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
+	/// <summary>
+	/// <para>Should the request should block until the update by query operation is complete.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? WaitForCompletion { get => Q<bool?>("wait_for_completion"); set => Q("wait_for_completion", value); }
-
 	[JsonInclude, JsonPropertyName("max_docs")]
 	public long? MaxDocs { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("slice")]
 	public Elastic.Clients.Elasticsearch.SlicedScroll? Slice { get; set; }
-
 	[JsonInclude, JsonPropertyName("conflicts")]
 	public Elastic.Clients.Elasticsearch.Conflicts? Conflicts { get; set; }
 }
 
+/// <summary>
+/// <para>Performs an update on every document in the index without changing the source,<br/>for example to pick up a mapping change.</para>
+/// </summary>
 public sealed partial class UpdateByQueryRequestDescriptor<TDocument> : RequestDescriptor<UpdateByQueryRequestDescriptor<TDocument>, UpdateByQueryRequestParameters>
 {
 	internal UpdateByQueryRequestDescriptor(Action<UpdateByQueryRequestDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public UpdateByQueryRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -234,9 +381,12 @@ internal UpdateByQueryRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceUpdateByQuery;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceUpdateByQuery;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public UpdateByQueryRequestDescriptor<TDocument> AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public UpdateByQueryRequestDescriptor<TDocument> AnalyzeWildcard(bool? analyzeWildcard = true) => Qs("analyze_wildcard", analyzeWildcard);
 	public UpdateByQueryRequestDescriptor<TDocument> Analyzer(string? analyzer) => Qs("analyzer", analyzer);
@@ -265,6 +415,7 @@ internal UpdateByQueryRequestDescriptor()
 	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);
 	public UpdateByQueryRequestDescriptor<TDocument> WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
+
 	public UpdateByQueryRequestDescriptor<TDocument> Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -272,21 +423,13 @@ public UpdateByQueryRequestDescriptor<TDocument> Indices(Elastic.Clients.Elastic
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; }
-
 	private SlicedScrollDescriptor<TDocument> SliceDescriptor { get; set; }
-
 	private Action<SlicedScrollDescriptor<TDocument>> SliceDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Conflicts? ConflictsValue { get; set; }
-
 	private long? MaxDocsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public UpdateByQueryRequestDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
@@ -412,9 +555,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>Performs an update on every document in the index without changing the source,<br/>for example to pick up a mapping change.</para>
+/// </summary>
 public sealed partial class UpdateByQueryRequestDescriptor : RequestDescriptor<UpdateByQueryRequestDescriptor, UpdateByQueryRequestParameters>
 {
 	internal UpdateByQueryRequestDescriptor(Action<UpdateByQueryRequestDescriptor> configure) => configure.Invoke(this);
+
 	public UpdateByQueryRequestDescriptor(Elastic.Clients.Elasticsearch.Indices indices) : base(r => r.Required("index", indices))
 	{
 	}
@@ -423,9 +570,12 @@ internal UpdateByQueryRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceUpdateByQuery;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceUpdateByQuery;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public UpdateByQueryRequestDescriptor AllowNoIndices(bool? allowNoIndices = true) => Qs("allow_no_indices", allowNoIndices);
 	public UpdateByQueryRequestDescriptor AnalyzeWildcard(bool? analyzeWildcard = true) => Qs("analyze_wildcard", analyzeWildcard);
 	public UpdateByQueryRequestDescriptor Analyzer(string? analyzer) => Qs("analyzer", analyzer);
@@ -454,6 +604,7 @@ internal UpdateByQueryRequestDescriptor()
 	public UpdateByQueryRequestDescriptor VersionType(bool? versionType = true) => Qs("version_type", versionType);
 	public UpdateByQueryRequestDescriptor WaitForActiveShards(Elastic.Clients.Elasticsearch.WaitForActiveShards? waitForActiveShards) => Qs("wait_for_active_shards", waitForActiveShards);
 	public UpdateByQueryRequestDescriptor WaitForCompletion(bool? waitForCompletion = true) => Qs("wait_for_completion", waitForCompletion);
+
 	public UpdateByQueryRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices indices)
 	{
 		RouteValues.Required("index", indices);
@@ -461,21 +612,13 @@ public UpdateByQueryRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indi
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; }
-
 	private SlicedScrollDescriptor SliceDescriptor { get; set; }
-
 	private Action<SlicedScrollDescriptor> SliceDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Conflicts? ConflictsValue { get; set; }
-
 	private long? MaxDocsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public UpdateByQueryRequestDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs
index 52a2b804e15..4982ab7dc2f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryResponse.g.cs
@@ -15,61 +15,48 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class UpdateByQueryResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("batches")]
 	public long? Batches { get; init; }
-
 	[JsonInclude, JsonPropertyName("deleted")]
 	public long? Deleted { get; init; }
-
 	[JsonInclude, JsonPropertyName("failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.BulkIndexByScrollFailure>? Failures { get; init; }
-
 	[JsonInclude, JsonPropertyName("noops")]
 	public long? Noops { get; init; }
-
 	[JsonInclude, JsonPropertyName("requests_per_second")]
 	public float? RequestsPerSecond { get; init; }
-
 	[JsonInclude, JsonPropertyName("retries")]
 	public Elastic.Clients.Elasticsearch.Retries? Retries { get; init; }
-
 	[JsonInclude, 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; }
-
 	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool? TimedOut { get; init; }
-
 	[JsonInclude, JsonPropertyName("took")]
 	public long? Took { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public long? Total { get; init; }
-
 	[JsonInclude, JsonPropertyName("updated")]
 	public long? Updated { get; init; }
-
 	[JsonInclude, JsonPropertyName("version_conflicts")]
 	public long? VersionConflicts { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleRequest.g.cs
index 90e2c5600eb..cda3d2be049 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,30 +27,45 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class UpdateByQueryRethrottleRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The throttle to set on this request in floating sub-requests per second. -1 means set no throttle.</para>
+	/// </summary>
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 }
 
+/// <summary>
+/// <para>Changes the number of requests per second for a particular Update By Query operation.</para>
+/// </summary>
 public sealed partial class UpdateByQueryRethrottleRequest : PlainRequest<UpdateByQueryRethrottleRequestParameters>
 {
 	public UpdateByQueryRethrottleRequest(Elastic.Clients.Elasticsearch.Id task_id) : base(r => r.Required("task_id", task_id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceUpdateByQueryRethrottle;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceUpdateByQueryRethrottle;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
+	/// <summary>
+	/// <para>The throttle to set on this request in floating sub-requests per second. -1 means set no throttle.</para>
+	/// </summary>
 	[JsonIgnore]
 	public float? RequestsPerSecond { get => Q<float?>("requests_per_second"); set => Q("requests_per_second", value); }
 }
 
+/// <summary>
+/// <para>Changes the number of requests per second for a particular Update By Query operation.</para>
+/// </summary>
 public sealed partial class UpdateByQueryRethrottleRequestDescriptor : RequestDescriptor<UpdateByQueryRethrottleRequestDescriptor, UpdateByQueryRethrottleRequestParameters>
 {
 	internal UpdateByQueryRethrottleRequestDescriptor(Action<UpdateByQueryRethrottleRequestDescriptor> configure) => configure.Invoke(this);
+
 	public UpdateByQueryRethrottleRequestDescriptor(Elastic.Clients.Elasticsearch.Id task_id) : base(r => r.Required("task_id", task_id))
 	{
 	}
@@ -57,10 +74,14 @@ internal UpdateByQueryRethrottleRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceUpdateByQueryRethrottle;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceUpdateByQueryRethrottle;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => false;
+
 	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/UpdateByQueryRethrottleResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleResponse.g.cs
index 1cad20c26b3..1847b54c448 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateByQueryRethrottleResponse.g.cs
@@ -15,14 +15,16 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class UpdateByQueryRethrottleResponse : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("nodes")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs
index fb189ce32eb..41691d5f6cd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -25,113 +27,199 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed class UpdateRequestParameters : RequestParameters
 {
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Only perform the operation if the document has this primary term.</para>
+	/// </summary>
 	public long? IfPrimaryTerm { get => Q<long?>("if_primary_term"); set => Q("if_primary_term", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Only perform the operation if the document has this sequence number.</para>
+	/// </summary>
 	public long? IfSeqNo { get => Q<long?>("if_seq_no"); set => Q("if_seq_no", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The script language.</para>
+	/// </summary>
 	public string? Lang { get => Q<string?>("lang"); set => Q("lang", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If 'true', Elasticsearch refreshes the affected shards to make this operation<br/>visible to search, if 'wait_for' then wait for a refresh to make this operation<br/>visible to search, if 'false' do nothing with refreshes.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Refresh?>("refresh"); set => Q("refresh", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>If true, the destination must be an index alias.</para>
+	/// </summary>
 	public bool? RequireAlias { get => Q<bool?>("require_alias"); set => Q("require_alias", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify how many times should the operation be retried when a conflict occurs.</para>
+	/// </summary>
 	public int? RetryOnConflict { get => Q<int?>("retry_on_conflict"); set => Q("retry_on_conflict", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Custom value used to route operations to a specific shard.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Period to wait for dynamic mapping updates and active shards.<br/>This guarantees Elasticsearch waits for at least the timeout before failing.<br/>The actual wait time could be longer, particularly when multiple waits occur.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>The number of shard copies that must be active before proceeding with the operations.<br/>Set to 'all' or any positive integer up to the total number of shards in the index<br/>(number_of_replicas+1). Defaults to 1 meaning the primary shard.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the source fields you want to exclude.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
-	[JsonIgnore]
+	/// <summary>
+	/// <para>Specify the source fields you want to retrieve.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 }
 
+/// <summary>
+/// <para>Updates a document with a script or partial document.</para>
+/// </summary>
 public sealed partial class UpdateRequest<TDocument, TPartialDocument> : PlainRequest<UpdateRequestParameters>
 {
 	public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceUpdate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceUpdate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
+	/// <summary>
+	/// <para>Only perform the operation if the document has this primary term.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? IfPrimaryTerm { get => Q<long?>("if_primary_term"); set => Q("if_primary_term", value); }
 
+	/// <summary>
+	/// <para>Only perform the operation if the document has this sequence number.</para>
+	/// </summary>
 	[JsonIgnore]
 	public long? IfSeqNo { get => Q<long?>("if_seq_no"); set => Q("if_seq_no", value); }
 
+	/// <summary>
+	/// <para>The script language.</para>
+	/// </summary>
 	[JsonIgnore]
 	public string? Lang { get => Q<string?>("lang"); set => Q("lang", value); }
 
+	/// <summary>
+	/// <para>If 'true', Elasticsearch refreshes the affected shards to make this operation<br/>visible to search, if 'wait_for' then wait for a refresh to make this operation<br/>visible to search, if 'false' do nothing with refreshes.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Refresh? Refresh { get => Q<Elastic.Clients.Elasticsearch.Refresh?>("refresh"); set => Q("refresh", value); }
 
+	/// <summary>
+	/// <para>If true, the destination must be an index alias.</para>
+	/// </summary>
 	[JsonIgnore]
 	public bool? RequireAlias { get => Q<bool?>("require_alias"); set => Q("require_alias", value); }
 
+	/// <summary>
+	/// <para>Specify how many times should the operation be retried when a conflict occurs.</para>
+	/// </summary>
 	[JsonIgnore]
 	public int? RetryOnConflict { get => Q<int?>("retry_on_conflict"); set => Q("retry_on_conflict", value); }
 
+	/// <summary>
+	/// <para>Custom value used to route operations to a specific shard.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get => Q<Elastic.Clients.Elasticsearch.Routing?>("routing"); set => Q("routing", value); }
 
+	/// <summary>
+	/// <para>Period to wait for dynamic mapping updates and active shards.<br/>This guarantees Elasticsearch waits for at least the timeout before failing.<br/>The actual wait time could be longer, particularly when multiple waits occur.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Duration? Timeout { get => Q<Elastic.Clients.Elasticsearch.Duration?>("timeout"); set => Q("timeout", value); }
 
+	/// <summary>
+	/// <para>The number of shard copies that must be active before proceeding with the operations.<br/>Set to 'all' or any positive integer up to the total number of shards in the index<br/>(number_of_replicas+1). Defaults to 1 meaning the primary shard.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
 
+	/// <summary>
+	/// <para>Specify the source fields you want to exclude.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceExcludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_excludes"); set => Q("_source_excludes", value); }
 
+	/// <summary>
+	/// <para>Specify the source fields you want to retrieve.</para>
+	/// </summary>
 	[JsonIgnore]
 	public Elastic.Clients.Elasticsearch.Fields? SourceIncludes { get => Q<Elastic.Clients.Elasticsearch.Fields?>("_source_includes"); set => Q("_source_includes", value); }
 
+	/// <summary>
+	/// <para>Set to false to disable setting 'result' in the response<br/>to 'noop' if no change to the document occurred.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("detect_noop")]
 	public bool? DetectNoop { get; set; }
 
+	/// <summary>
+	/// <para>A partial update to an existing document.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("doc")]
 	[SourceConverter]
 	public TPartialDocument? Doc { get; set; }
 
+	/// <summary>
+	/// <para>Set to true to use the contents of 'doc' as the value of 'upsert'</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("doc_as_upsert")]
 	public bool? DocAsUpsert { get; set; }
 
+	/// <summary>
+	/// <para>Script to execute to update the document.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 
+	/// <summary>
+	/// <para>Set to true to execute the script whether or not the document exists.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("scripted_upsert")]
 	public bool? ScriptedUpsert { get; set; }
 
+	/// <summary>
+	/// <para>Set to false to disable source retrieval. You can also specify a comma-separated<br/>list of the fields you want to retrieve.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
 
+	/// <summary>
+	/// <para>If the document does not already exist, the contents of 'upsert' are inserted as a<br/>new document. If the document exists, the 'script' is executed.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("upsert")]
 	[SourceConverter]
 	public TDocument? Upsert { get; set; }
 }
 
+/// <summary>
+/// <para>Updates a document with a script or partial document.</para>
+/// </summary>
 public sealed partial class UpdateRequestDescriptor<TDocument, TPartialDocument> : RequestDescriptor<UpdateRequestDescriptor<TDocument, TPartialDocument>, UpdateRequestParameters>
 {
 	internal UpdateRequestDescriptor(Action<UpdateRequestDescriptor<TDocument, TPartialDocument>> configure) => configure.Invoke(this);
+
 	public UpdateRequestDescriptor(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clients.Elasticsearch.Id id) : base(r => r.Required("index", index).Required("id", id))
 	{
 	}
@@ -160,9 +248,12 @@ internal UpdateRequestDescriptor()
 	{
 	}
 
-	internal override ApiUrls ApiUrls => ApiUrlsLookups.NoNamespaceUpdate;
+	internal override ApiUrls ApiUrls => ApiUrlLookup.NoNamespaceUpdate;
+
 	protected override HttpMethod StaticHttpMethod => HttpMethod.POST;
+
 	internal override bool SupportsBody => true;
+
 	public UpdateRequestDescriptor<TDocument, TPartialDocument> SourceExcludes(Elastic.Clients.Elasticsearch.Fields? sourceExcludes) => Qs("_source_excludes", sourceExcludes);
 	public UpdateRequestDescriptor<TDocument, TPartialDocument> SourceIncludes(Elastic.Clients.Elasticsearch.Fields? sourceIncludes) => Qs("_source_includes", sourceIncludes);
 	public UpdateRequestDescriptor<TDocument, TPartialDocument> IfPrimaryTerm(long? ifPrimaryTerm) => Qs("if_primary_term", ifPrimaryTerm);
@@ -174,6 +265,7 @@ internal UpdateRequestDescriptor()
 	public UpdateRequestDescriptor<TDocument, TPartialDocument> Routing(Elastic.Clients.Elasticsearch.Routing? routing) => Qs("routing", routing);
 	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)
 	{
 		RouteValues.Required("id", id);
@@ -187,55 +279,70 @@ public UpdateRequestDescriptor<TDocument, TPartialDocument> Index(Elastic.Client
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private bool? DetectNoopValue { get; set; }
-
 	private TPartialDocument? DocValue { get; set; }
-
 	private bool? DocAsUpsertValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private bool? ScriptedUpsertValue { get; set; }
-
 	private TDocument? UpsertValue { get; set; }
 
+	/// <summary>
+	/// <para>Set to false to disable source retrieval. You can also specify a comma-separated<br/>list of the fields you want to retrieve.</para>
+	/// </summary>
 	public UpdateRequestDescriptor<TDocument, TPartialDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source)
 	{
 		SourceValue = source;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Set to false to disable setting 'result' in the response<br/>to 'noop' if no change to the document occurred.</para>
+	/// </summary>
 	public UpdateRequestDescriptor<TDocument, TPartialDocument> DetectNoop(bool? detectNoop = true)
 	{
 		DetectNoopValue = detectNoop;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>A partial update to an existing document.</para>
+	/// </summary>
 	public UpdateRequestDescriptor<TDocument, TPartialDocument> Doc(TPartialDocument? doc)
 	{
 		DocValue = doc;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Set to true to use the contents of 'doc' as the value of 'upsert'</para>
+	/// </summary>
 	public UpdateRequestDescriptor<TDocument, TPartialDocument> DocAsUpsert(bool? docAsUpsert = true)
 	{
 		DocAsUpsertValue = docAsUpsert;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Script to execute to update the document.</para>
+	/// </summary>
 	public UpdateRequestDescriptor<TDocument, TPartialDocument> Script(Elastic.Clients.Elasticsearch.Script? script)
 	{
 		ScriptValue = script;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Set to true to execute the script whether or not the document exists.</para>
+	/// </summary>
 	public UpdateRequestDescriptor<TDocument, TPartialDocument> ScriptedUpsert(bool? scriptedUpsert = true)
 	{
 		ScriptedUpsertValue = scriptedUpsert;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If the document does not already exist, the contents of 'upsert' are inserted as a<br/>new document. If the document exists, the 'script' is executed.</para>
+	/// </summary>
 	public UpdateRequestDescriptor<TDocument, TPartialDocument> Upsert(TDocument? upsert)
 	{
 		UpsertValue = upsert;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateResponse.g.cs
index fe9131249ed..1ce9e98353b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateResponse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateResponse.g.cs
@@ -15,40 +15,34 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class UpdateResponse<TDocument> : ElasticsearchResponse
 {
 	[JsonInclude, JsonPropertyName("forced_refresh")]
 	public bool? ForcedRefresh { get; init; }
-
 	[JsonInclude, JsonPropertyName("get")]
 	public Elastic.Clients.Elasticsearch.InlineGet<TDocument>? Get { get; init; }
-
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("_primary_term")]
 	public long PrimaryTerm { get; init; }
-
 	[JsonInclude, JsonPropertyName("result")]
 	public Elastic.Clients.Elasticsearch.Result Result { get; init; }
-
 	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long SeqNo { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("_version")]
 	public long Version { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs
index d91efc515ca..ce7642dcb21 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs
@@ -15,17 +15,19 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
+
 public partial class AsyncSearchNamespacedClient : NamespacedClientProxy
 {
 	/// <summary>
 	/// Initializes a new instance of the <see cref="AsyncSearchNamespacedClient"/> class for mocking.
-	/// </summary>			
+	/// </summary>
 	protected AsyncSearchNamespacedClient() : base()
 	{
 	}
@@ -34,12 +36,20 @@ internal AsyncSearchNamespacedClient(ElasticsearchClient client) : base(client)
 	{
 	}
 
+	/// <summary>
+	/// <para>Retrieves the status of a previously submitted async search request given its ID.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/async-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual AsyncSearchStatusResponse Status(AsyncSearchStatusRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<AsyncSearchStatusRequest, AsyncSearchStatusResponse, AsyncSearchStatusRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Retrieves the status of a previously submitted async search request given its ID.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/async-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<AsyncSearchStatusResponse> StatusAsync(AsyncSearchStatusRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -92,12 +102,20 @@ public virtual Task<AsyncSearchStatusResponse> StatusAsync<TDocument>(Elastic.Cl
 		return DoRequestAsync<AsyncSearchStatusRequestDescriptor<TDocument>, AsyncSearchStatusResponse, AsyncSearchStatusRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Deletes an async search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/async-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeleteAsyncSearchResponse Delete(DeleteAsyncSearchRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeleteAsyncSearchRequest, DeleteAsyncSearchResponse, DeleteAsyncSearchRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Deletes an async search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/async-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeleteAsyncSearchResponse> DeleteAsync(DeleteAsyncSearchRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -150,12 +168,20 @@ public virtual Task<DeleteAsyncSearchResponse> DeleteAsync<TDocument>(Elastic.Cl
 		return DoRequestAsync<DeleteAsyncSearchRequestDescriptor<TDocument>, DeleteAsyncSearchResponse, DeleteAsyncSearchRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Retrieves the results of a previously submitted async search request given its ID.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/async-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetAsyncSearchResponse<TDocument> Get<TDocument>(GetAsyncSearchRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetAsyncSearchRequest, GetAsyncSearchResponse<TDocument>, GetAsyncSearchRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Retrieves the results of a previously submitted async search request given its ID.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/async-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetAsyncSearchResponse<TDocument>> GetAsync<TDocument>(GetAsyncSearchRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -192,12 +218,20 @@ public virtual Task<GetAsyncSearchResponse<TDocument>> GetAsync<TDocument>(Elast
 		return DoRequestAsync<GetAsyncSearchRequestDescriptor<TDocument>, GetAsyncSearchResponse<TDocument>, GetAsyncSearchRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Executes a search request asynchronously.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/async-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual SubmitAsyncSearchResponse<TDocument> Submit<TDocument>(SubmitAsyncSearchRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<SubmitAsyncSearchRequest, SubmitAsyncSearchResponse<TDocument>, SubmitAsyncSearchRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Executes a search request asynchronously.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/async-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<SubmitAsyncSearchResponse<TDocument>> SubmitAsync<TDocument>(SubmitAsyncSearchRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Cluster.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Cluster.g.cs
index 5e75fc8fcc1..91e4090ffc4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Cluster.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Cluster.g.cs
@@ -15,17 +15,19 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Cluster;
+
 public partial class ClusterNamespacedClient : NamespacedClientProxy
 {
 	/// <summary>
 	/// Initializes a new instance of the <see cref="ClusterNamespacedClient"/> class for mocking.
-	/// </summary>			
+	/// </summary>
 	protected ClusterNamespacedClient() : base()
 	{
 	}
@@ -34,12 +36,20 @@ internal ClusterNamespacedClient(ElasticsearchClient client) : base(client)
 	{
 	}
 
+	/// <summary>
+	/// <para>Returns basic information about the health of the cluster.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/cluster-health.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual HealthResponse Health(HealthRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<HealthRequest, HealthResponse, HealthRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns basic information about the health of the cluster.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/cluster-health.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<HealthResponse> HealthAsync(HealthRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Eql.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Eql.g.cs
index 5d49eba6e3d..7ae910ae6f0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Eql.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Eql.g.cs
@@ -15,17 +15,19 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public partial class EqlNamespacedClient : NamespacedClientProxy
 {
 	/// <summary>
 	/// Initializes a new instance of the <see cref="EqlNamespacedClient"/> class for mocking.
-	/// </summary>			
+	/// </summary>
 	protected EqlNamespacedClient() : base()
 	{
 	}
@@ -34,12 +36,20 @@ internal EqlNamespacedClient(ElasticsearchClient client) : base(client)
 	{
 	}
 
+	/// <summary>
+	/// <para>Deletes an async EQL search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual EqlDeleteResponse Delete(EqlDeleteRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<EqlDeleteRequest, EqlDeleteResponse, EqlDeleteRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Deletes an async EQL search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<EqlDeleteResponse> DeleteAsync(EqlDeleteRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -92,12 +102,20 @@ public virtual Task<EqlDeleteResponse> DeleteAsync<TDocument>(Elastic.Clients.El
 		return DoRequestAsync<EqlDeleteRequestDescriptor<TDocument>, EqlDeleteResponse, EqlDeleteRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns async results from previously executed Event Query Language (EQL) search</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual EqlGetResponse<TEvent> Get<TEvent>(EqlGetRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<EqlGetRequest, EqlGetResponse<TEvent>, EqlGetRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns async results from previously executed Event Query Language (EQL) search</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<EqlGetResponse<TEvent>> GetAsync<TEvent>(EqlGetRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -134,12 +152,20 @@ public virtual Task<EqlGetResponse<TEvent>> GetAsync<TEvent>(Elastic.Clients.Ela
 		return DoRequestAsync<EqlGetRequestDescriptor, EqlGetResponse<TEvent>, EqlGetRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns results matching a query expressed in Event Query Language (EQL)</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual EqlSearchResponse<TEvent> Search<TEvent>(EqlSearchRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<EqlSearchRequest, EqlSearchResponse<TEvent>, EqlSearchRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns results matching a query expressed in Event Query Language (EQL)</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<EqlSearchResponse<TEvent>> SearchAsync<TEvent>(EqlSearchRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -176,12 +202,20 @@ public virtual Task<EqlSearchResponse<TEvent>> SearchAsync<TEvent>(Elastic.Clien
 		return DoRequestAsync<EqlSearchRequestDescriptor, EqlSearchResponse<TEvent>, EqlSearchRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns the status of a previously submitted async or stored Event Query Language (EQL) search</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetEqlStatusResponse GetStatus(GetEqlStatusRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetEqlStatusRequest, GetEqlStatusResponse, GetEqlStatusRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns the status of a previously submitted async or stored Event Query Language (EQL) search</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetEqlStatusResponse> GetStatusAsync(GetEqlStatusRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs
index 3ba96c1d265..b749abb041d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Indices.g.cs
@@ -15,17 +15,19 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public partial class IndicesNamespacedClient : NamespacedClientProxy
 {
 	/// <summary>
 	/// Initializes a new instance of the <see cref="IndicesNamespacedClient"/> class for mocking.
-	/// </summary>			
+	/// </summary>
 	protected IndicesNamespacedClient() : base()
 	{
 	}
@@ -34,12 +36,20 @@ internal IndicesNamespacedClient(ElasticsearchClient client) : base(client)
 	{
 	}
 
+	/// <summary>
+	/// <para>Clones an index</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-clone-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual CloneIndexResponse Clone(CloneIndexRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<CloneIndexRequest, CloneIndexResponse, CloneIndexRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Clones an index</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-clone-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<CloneIndexResponse> CloneAsync(CloneIndexRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -122,12 +132,20 @@ public virtual Task<CloneIndexResponse> CloneAsync<TDocument>(Elastic.Clients.El
 		return DoRequestAsync<CloneIndexRequestDescriptor<TDocument>, CloneIndexResponse, CloneIndexRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Closes an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual CloseIndexResponse Close(CloseIndexRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<CloseIndexRequest, CloseIndexResponse, CloseIndexRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Closes an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<CloseIndexResponse> CloseAsync(CloseIndexRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -180,12 +198,20 @@ public virtual Task<CloseIndexResponse> CloseAsync<TDocument>(Elastic.Clients.El
 		return DoRequestAsync<CloseIndexRequestDescriptor<TDocument>, CloseIndexResponse, CloseIndexRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Creates a data stream</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual CreateDataStreamResponse CreateDataStream(CreateDataStreamRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<CreateDataStreamRequest, CreateDataStreamResponse, CreateDataStreamRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Creates a data stream</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<CreateDataStreamResponse> CreateDataStreamAsync(CreateDataStreamRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -222,12 +248,20 @@ public virtual Task<CreateDataStreamResponse> CreateDataStreamAsync(Elastic.Clie
 		return DoRequestAsync<CreateDataStreamRequestDescriptor, CreateDataStreamResponse, CreateDataStreamRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Creates an index with optional settings and mappings.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-create-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual CreateIndexResponse Create(CreateIndexRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<CreateIndexRequest, CreateIndexResponse, CreateIndexRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Creates an index with optional settings and mappings.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-create-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<CreateIndexResponse> CreateAsync(CreateIndexRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -310,12 +344,20 @@ public virtual Task<CreateIndexResponse> CreateAsync<TDocument>(Elastic.Clients.
 		return DoRequestAsync<CreateIndexRequestDescriptor<TDocument>, CreateIndexResponse, CreateIndexRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Deletes an alias.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeleteAliasResponse DeleteAlias(DeleteAliasRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeleteAliasRequest, DeleteAliasResponse, DeleteAliasRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Deletes an alias.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeleteAliasResponse> DeleteAliasAsync(DeleteAliasRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -368,12 +410,20 @@ public virtual Task<DeleteAliasResponse> DeleteAliasAsync<TDocument>(Elastic.Cli
 		return DoRequestAsync<DeleteAliasRequestDescriptor<TDocument>, DeleteAliasResponse, DeleteAliasRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Deletes a data stream.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeleteDataStreamResponse DeleteDataStream(DeleteDataStreamRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeleteDataStreamRequest, DeleteDataStreamResponse, DeleteDataStreamRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Deletes a data stream.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeleteDataStreamResponse> DeleteDataStreamAsync(DeleteDataStreamRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -410,12 +460,20 @@ public virtual Task<DeleteDataStreamResponse> DeleteDataStreamAsync(Elastic.Clie
 		return DoRequestAsync<DeleteDataStreamRequestDescriptor, DeleteDataStreamResponse, DeleteDataStreamRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Deletes an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-delete-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeleteIndexResponse Delete(DeleteIndexRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeleteIndexRequest, DeleteIndexResponse, DeleteIndexRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Deletes an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-delete-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeleteIndexResponse> DeleteAsync(DeleteIndexRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -468,12 +526,20 @@ public virtual Task<DeleteIndexResponse> DeleteAsync<TDocument>(Elastic.Clients.
 		return DoRequestAsync<DeleteIndexRequestDescriptor<TDocument>, DeleteIndexResponse, DeleteIndexRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Deletes an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeleteIndexTemplateResponse DeleteIndexTemplate(DeleteIndexTemplateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse, DeleteIndexTemplateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Deletes an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeleteIndexTemplateResponse> DeleteIndexTemplateAsync(DeleteIndexTemplateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -510,12 +576,20 @@ public virtual Task<DeleteIndexTemplateResponse> DeleteIndexTemplateAsync(Elasti
 		return DoRequestAsync<DeleteIndexTemplateRequestDescriptor, DeleteIndexTemplateResponse, DeleteIndexTemplateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Deletes an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeleteTemplateResponse DeleteTemplate(DeleteTemplateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeleteTemplateRequest, DeleteTemplateResponse, DeleteTemplateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Deletes an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeleteTemplateResponse> DeleteTemplateAsync(DeleteTemplateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -552,12 +626,20 @@ public virtual Task<DeleteTemplateResponse> DeleteTemplateAsync(Elastic.Clients.
 		return DoRequestAsync<DeleteTemplateRequestDescriptor, DeleteTemplateResponse, DeleteTemplateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a particular alias exists.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ExistsAliasResponse ExistsAlias(ExistsAliasRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ExistsAliasRequest, ExistsAliasResponse, ExistsAliasRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a particular alias exists.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ExistsAliasResponse> ExistsAliasAsync(ExistsAliasRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -610,12 +692,20 @@ public virtual Task<ExistsAliasResponse> ExistsAliasAsync<TDocument>(Elastic.Cli
 		return DoRequestAsync<ExistsAliasRequestDescriptor<TDocument>, ExistsAliasResponse, ExistsAliasRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a particular index template exists.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ExistsIndexTemplateResponse ExistsIndexTemplate(ExistsIndexTemplateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ExistsIndexTemplateRequest, ExistsIndexTemplateResponse, ExistsIndexTemplateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a particular index template exists.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ExistsIndexTemplateResponse> ExistsIndexTemplateAsync(ExistsIndexTemplateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -652,12 +742,20 @@ public virtual Task<ExistsIndexTemplateResponse> ExistsIndexTemplateAsync(Elasti
 		return DoRequestAsync<ExistsIndexTemplateRequestDescriptor, ExistsIndexTemplateResponse, ExistsIndexTemplateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a particular index exists.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-exists.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ExistsResponse Exists(ExistsRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ExistsRequest, ExistsResponse, ExistsRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a particular index exists.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-exists.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ExistsResponse> ExistsAsync(ExistsRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -710,12 +808,20 @@ public virtual Task<ExistsResponse> ExistsAsync<TDocument>(Elastic.Clients.Elast
 		return DoRequestAsync<ExistsRequestDescriptor<TDocument>, ExistsResponse, ExistsRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a particular index template exists.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ExistsTemplateResponse ExistsTemplate(ExistsTemplateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ExistsTemplateRequest, ExistsTemplateResponse, ExistsTemplateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a particular index template exists.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ExistsTemplateResponse> ExistsTemplateAsync(ExistsTemplateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -752,12 +858,20 @@ public virtual Task<ExistsTemplateResponse> ExistsTemplateAsync(Elastic.Clients.
 		return DoRequestAsync<ExistsTemplateRequestDescriptor, ExistsTemplateResponse, ExistsTemplateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Performs the flush operation on one or more indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-flush.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual FlushResponse Flush(FlushRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<FlushRequest, FlushResponse, FlushRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Performs the flush operation on one or more indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-flush.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<FlushResponse> FlushAsync(FlushRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -810,12 +924,20 @@ public virtual Task<FlushResponse> FlushAsync<TDocument>(Action<FlushRequestDesc
 		return DoRequestAsync<FlushRequestDescriptor<TDocument>, FlushResponse, FlushRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Performs the force merge operation on one or more indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-forcemerge.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ForcemergeResponse Forcemerge(ForcemergeRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ForcemergeRequest, ForcemergeResponse, ForcemergeRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Performs the force merge operation on one or more indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-forcemerge.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ForcemergeResponse> ForcemergeAsync(ForcemergeRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -868,12 +990,20 @@ public virtual Task<ForcemergeResponse> ForcemergeAsync<TDocument>(Action<Forcem
 		return DoRequestAsync<ForcemergeRequestDescriptor<TDocument>, ForcemergeResponse, ForcemergeRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns an alias.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetAliasResponse GetAlias(GetAliasRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetAliasRequest, GetAliasResponse, GetAliasRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns an alias.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetAliasResponse> GetAliasAsync(GetAliasRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -926,12 +1056,20 @@ public virtual Task<GetAliasResponse> GetAliasAsync<TDocument>(Action<GetAliasRe
 		return DoRequestAsync<GetAliasRequestDescriptor<TDocument>, GetAliasResponse, GetAliasRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns data streams.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetDataStreamResponse GetDataStream(GetDataStreamRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetDataStreamRequest, GetDataStreamResponse, GetDataStreamRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns data streams.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetDataStreamResponse> GetDataStreamAsync(GetDataStreamRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -968,12 +1106,20 @@ public virtual Task<GetDataStreamResponse> GetDataStreamAsync(Action<GetDataStre
 		return DoRequestAsync<GetDataStreamRequestDescriptor, GetDataStreamResponse, GetDataStreamRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns mapping for one or more fields.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-field-mapping.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetFieldMappingResponse GetFieldMapping(GetFieldMappingRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetFieldMappingRequest, GetFieldMappingResponse, GetFieldMappingRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns mapping for one or more fields.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-field-mapping.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetFieldMappingResponse> GetFieldMappingAsync(GetFieldMappingRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1026,12 +1172,20 @@ public virtual Task<GetFieldMappingResponse> GetFieldMappingAsync<TDocument>(Ela
 		return DoRequestAsync<GetFieldMappingRequestDescriptor<TDocument>, GetFieldMappingResponse, GetFieldMappingRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns information about one or more indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetIndexResponse Get(GetIndexRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetIndexRequest, GetIndexResponse, GetIndexRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns information about one or more indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetIndexResponse> GetAsync(GetIndexRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1084,12 +1238,20 @@ public virtual Task<GetIndexResponse> GetAsync<TDocument>(Elastic.Clients.Elasti
 		return DoRequestAsync<GetIndexRequestDescriptor<TDocument>, GetIndexResponse, GetIndexRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetIndexTemplateResponse GetIndexTemplate(GetIndexTemplateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetIndexTemplateRequest, GetIndexTemplateResponse, GetIndexTemplateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetIndexTemplateResponse> GetIndexTemplateAsync(GetIndexTemplateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1126,12 +1288,20 @@ public virtual Task<GetIndexTemplateResponse> GetIndexTemplateAsync(Action<GetIn
 		return DoRequestAsync<GetIndexTemplateRequestDescriptor, GetIndexTemplateResponse, GetIndexTemplateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns mappings for one or more indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-mapping.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetMappingResponse GetMapping(GetMappingRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetMappingRequest, GetMappingResponse, GetMappingRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns mappings for one or more indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-mapping.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetMappingResponse> GetMappingAsync(GetMappingRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1184,12 +1354,20 @@ public virtual Task<GetMappingResponse> GetMappingAsync<TDocument>(Action<GetMap
 		return DoRequestAsync<GetMappingRequestDescriptor<TDocument>, GetMappingResponse, GetMappingRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetTemplateResponse GetTemplate(GetTemplateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetTemplateRequest, GetTemplateResponse, GetTemplateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetTemplateResponse> GetTemplateAsync(GetTemplateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1226,12 +1404,20 @@ public virtual Task<GetTemplateResponse> GetTemplateAsync(Action<GetTemplateRequ
 		return DoRequestAsync<GetTemplateRequestDescriptor, GetTemplateResponse, GetTemplateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Provides statistics on operations happening in an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-stats.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual IndicesStatsResponse Stats(IndicesStatsRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<IndicesStatsRequest, IndicesStatsResponse, IndicesStatsRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Provides statistics on operations happening in an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-stats.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<IndicesStatsResponse> StatsAsync(IndicesStatsRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1284,12 +1470,20 @@ public virtual Task<IndicesStatsResponse> StatsAsync<TDocument>(Action<IndicesSt
 		return DoRequestAsync<IndicesStatsRequestDescriptor<TDocument>, IndicesStatsResponse, IndicesStatsRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Migrates an alias to a data stream</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual MigrateToDataStreamResponse MigrateToDataStream(MigrateToDataStreamRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<MigrateToDataStreamRequest, MigrateToDataStreamResponse, MigrateToDataStreamRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Migrates an alias to a data stream</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<MigrateToDataStreamResponse> MigrateToDataStreamAsync(MigrateToDataStreamRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1326,12 +1520,20 @@ public virtual Task<MigrateToDataStreamResponse> MigrateToDataStreamAsync(Elasti
 		return DoRequestAsync<MigrateToDataStreamRequestDescriptor, MigrateToDataStreamResponse, MigrateToDataStreamRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Opens an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual OpenIndexResponse Open(OpenIndexRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<OpenIndexRequest, OpenIndexResponse, OpenIndexRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Opens an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<OpenIndexResponse> OpenAsync(OpenIndexRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1384,12 +1586,20 @@ public virtual Task<OpenIndexResponse> OpenAsync<TDocument>(Elastic.Clients.Elas
 		return DoRequestAsync<OpenIndexRequestDescriptor<TDocument>, OpenIndexResponse, OpenIndexRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates an alias.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual PutAliasResponse PutAlias(PutAliasRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<PutAliasRequest, PutAliasResponse, PutAliasRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates an alias.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<PutAliasResponse> PutAliasAsync(PutAliasRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1442,12 +1652,20 @@ public virtual Task<PutAliasResponse> PutAliasAsync<TDocument>(Elastic.Clients.E
 		return DoRequestAsync<PutAliasRequestDescriptor<TDocument>, PutAliasResponse, PutAliasRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual PutIndexTemplateResponse PutIndexTemplate(PutIndexTemplateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<PutIndexTemplateRequest, PutIndexTemplateResponse, PutIndexTemplateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<PutIndexTemplateResponse> PutIndexTemplateAsync(PutIndexTemplateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1500,12 +1718,20 @@ public virtual Task<PutIndexTemplateResponse> PutIndexTemplateAsync<TDocument>(E
 		return DoRequestAsync<PutIndexTemplateRequestDescriptor<TDocument>, PutIndexTemplateResponse, PutIndexTemplateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Updates the index mappings.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-put-mapping.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual PutMappingResponse PutMapping(PutMappingRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<PutMappingRequest, PutMappingResponse, PutMappingRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Updates the index mappings.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-put-mapping.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<PutMappingResponse> PutMappingAsync(PutMappingRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1558,12 +1784,20 @@ public virtual Task<PutMappingResponse> PutMappingAsync<TDocument>(Elastic.Clien
 		return DoRequestAsync<PutMappingRequestDescriptor<TDocument>, PutMappingResponse, PutMappingRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual PutTemplateResponse PutTemplate(PutTemplateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<PutTemplateRequest, PutTemplateResponse, PutTemplateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates an index template.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<PutTemplateResponse> PutTemplateAsync(PutTemplateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1600,12 +1834,20 @@ public virtual Task<PutTemplateResponse> PutTemplateAsync(Elastic.Clients.Elasti
 		return DoRequestAsync<PutTemplateRequestDescriptor, PutTemplateResponse, PutTemplateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Performs the refresh operation in one or more indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-refresh.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual RefreshResponse Refresh(RefreshRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<RefreshRequest, RefreshResponse, RefreshRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Performs the refresh operation in one or more indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-refresh.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<RefreshResponse> RefreshAsync(RefreshRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1658,12 +1900,20 @@ public virtual Task<RefreshResponse> RefreshAsync<TDocument>(Action<RefreshReque
 		return DoRequestAsync<RefreshRequestDescriptor<TDocument>, RefreshResponse, RefreshRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Updates an alias to point to a new index when the existing index<br/>is considered to be too large or too old.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-rollover-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual RolloverResponse Rollover(RolloverRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<RolloverRequest, RolloverResponse, RolloverRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Updates an alias to point to a new index when the existing index<br/>is considered to be too large or too old.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-rollover-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<RolloverResponse> RolloverAsync(RolloverRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1700,12 +1950,20 @@ public virtual Task<RolloverResponse> RolloverAsync(Elastic.Clients.Elasticsearc
 		return DoRequestAsync<RolloverRequestDescriptor, RolloverResponse, RolloverRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Allow to shrink an existing index into a new index with fewer primary shards.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-shrink-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ShrinkIndexResponse Shrink(ShrinkIndexRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ShrinkIndexRequest, ShrinkIndexResponse, ShrinkIndexRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Allow to shrink an existing index into a new index with fewer primary shards.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-shrink-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ShrinkIndexResponse> ShrinkAsync(ShrinkIndexRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1788,12 +2046,20 @@ public virtual Task<ShrinkIndexResponse> ShrinkAsync<TDocument>(Elastic.Clients.
 		return DoRequestAsync<ShrinkIndexRequestDescriptor<TDocument>, ShrinkIndexResponse, ShrinkIndexRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Simulate matching the given index name against the index templates in the system</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual SimulateIndexTemplateResponse SimulateIndexTemplate(SimulateIndexTemplateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<SimulateIndexTemplateRequest, SimulateIndexTemplateResponse, SimulateIndexTemplateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Simulate matching the given index name against the index templates in the system</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<SimulateIndexTemplateResponse> SimulateIndexTemplateAsync(SimulateIndexTemplateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1846,12 +2112,20 @@ public virtual Task<SimulateIndexTemplateResponse> SimulateIndexTemplateAsync<TD
 		return DoRequestAsync<SimulateIndexTemplateRequestDescriptor<TDocument>, SimulateIndexTemplateResponse, SimulateIndexTemplateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Simulate resolving the given template name or body</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual SimulateTemplateResponse SimulateTemplate(SimulateTemplateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<SimulateTemplateRequest, SimulateTemplateResponse, SimulateTemplateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Simulate resolving the given template name or body</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<SimulateTemplateResponse> SimulateTemplateAsync(SimulateTemplateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1888,12 +2162,20 @@ public virtual Task<SimulateTemplateResponse> SimulateTemplateAsync(Action<Simul
 		return DoRequestAsync<SimulateTemplateRequestDescriptor, SimulateTemplateResponse, SimulateTemplateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Allows you to split an existing index into a new index with more primary shards.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-split-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual SplitIndexResponse Split(SplitIndexRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<SplitIndexRequest, SplitIndexResponse, SplitIndexRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Allows you to split an existing index into a new index with more primary shards.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-split-index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<SplitIndexResponse> SplitAsync(SplitIndexRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1976,12 +2258,20 @@ public virtual Task<SplitIndexResponse> SplitAsync<TDocument>(Elastic.Clients.El
 		return DoRequestAsync<SplitIndexRequestDescriptor<TDocument>, SplitIndexResponse, SplitIndexRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Updates index aliases.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual UpdateAliasesResponse UpdateAliases(UpdateAliasesRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<UpdateAliasesRequest, UpdateAliasesResponse, UpdateAliasesRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Updates index aliases.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<UpdateAliasesResponse> UpdateAliasesAsync(UpdateAliasesRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Ingest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Ingest.g.cs
index 8c9b1589ccc..0b4be1bfdd1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Ingest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Ingest.g.cs
@@ -15,17 +15,19 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public partial class IngestNamespacedClient : NamespacedClientProxy
 {
 	/// <summary>
 	/// Initializes a new instance of the <see cref="IngestNamespacedClient"/> class for mocking.
-	/// </summary>			
+	/// </summary>
 	protected IngestNamespacedClient() : base()
 	{
 	}
@@ -34,12 +36,20 @@ internal IngestNamespacedClient(ElasticsearchClient client) : base(client)
 	{
 	}
 
+	/// <summary>
+	/// <para>Deletes a pipeline.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-pipeline-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeletePipelineResponse DeletePipeline(DeletePipelineRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeletePipelineRequest, DeletePipelineResponse, DeletePipelineRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Deletes a pipeline.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-pipeline-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeletePipelineResponse> DeletePipelineAsync(DeletePipelineRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -92,12 +102,20 @@ public virtual Task<DeletePipelineResponse> DeletePipelineAsync<TDocument>(Elast
 		return DoRequestAsync<DeletePipelineRequestDescriptor<TDocument>, DeletePipelineResponse, DeletePipelineRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns statistical information about geoip databases</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/geoip-stats-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GeoIpStatsResponse GeoIpStats(GeoIpStatsRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GeoIpStatsRequest, GeoIpStatsResponse, GeoIpStatsRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns statistical information about geoip databases</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/geoip-stats-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GeoIpStatsResponse> GeoIpStatsAsync(GeoIpStatsRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -134,12 +152,20 @@ public virtual Task<GeoIpStatsResponse> GeoIpStatsAsync(Action<GeoIpStatsRequest
 		return DoRequestAsync<GeoIpStatsRequestDescriptor, GeoIpStatsResponse, GeoIpStatsRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns a pipeline.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/get-pipeline-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetPipelineResponse GetPipeline(GetPipelineRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetPipelineRequest, GetPipelineResponse, GetPipelineRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns a pipeline.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/get-pipeline-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetPipelineResponse> GetPipelineAsync(GetPipelineRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -192,12 +218,20 @@ public virtual Task<GetPipelineResponse> GetPipelineAsync<TDocument>(Action<GetP
 		return DoRequestAsync<GetPipelineRequestDescriptor<TDocument>, GetPipelineResponse, GetPipelineRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns a list of the built-in patterns.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/grok-processor.html#grok-processor-rest-get">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ProcessorGrokResponse ProcessorGrok(ProcessorGrokRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ProcessorGrokRequest, ProcessorGrokResponse, ProcessorGrokRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns a list of the built-in patterns.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/grok-processor.html#grok-processor-rest-get">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ProcessorGrokResponse> ProcessorGrokAsync(ProcessorGrokRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -234,12 +268,20 @@ public virtual Task<ProcessorGrokResponse> ProcessorGrokAsync(Action<ProcessorGr
 		return DoRequestAsync<ProcessorGrokRequestDescriptor, ProcessorGrokResponse, ProcessorGrokRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates a pipeline.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/put-pipeline-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual PutPipelineResponse PutPipeline(PutPipelineRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<PutPipelineRequest, PutPipelineResponse, PutPipelineRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates a pipeline.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/put-pipeline-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<PutPipelineResponse> PutPipelineAsync(PutPipelineRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -292,12 +334,20 @@ public virtual Task<PutPipelineResponse> PutPipelineAsync<TDocument>(Elastic.Cli
 		return DoRequestAsync<PutPipelineRequestDescriptor<TDocument>, PutPipelineResponse, PutPipelineRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Allows to simulate a pipeline with example documents.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/simulate-pipeline-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual SimulateResponse Simulate(SimulateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<SimulateRequest, SimulateResponse, SimulateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Allows to simulate a pipeline with example documents.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/simulate-pipeline-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<SimulateResponse> SimulateAsync(SimulateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Sql.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Sql.g.cs
index 03f32e84c1e..6245962ffa3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Sql.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Sql.g.cs
@@ -15,17 +15,19 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public partial class SqlNamespacedClient : NamespacedClientProxy
 {
 	/// <summary>
 	/// Initializes a new instance of the <see cref="SqlNamespacedClient"/> class for mocking.
-	/// </summary>			
+	/// </summary>
 	protected SqlNamespacedClient() : base()
 	{
 	}
@@ -34,12 +36,20 @@ internal SqlNamespacedClient(ElasticsearchClient client) : base(client)
 	{
 	}
 
+	/// <summary>
+	/// <para>Clears the SQL cursor</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ClearCursorResponse ClearCursor(ClearCursorRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ClearCursorRequest, ClearCursorResponse, ClearCursorRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Clears the SQL cursor</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ClearCursorResponse> ClearCursorAsync(ClearCursorRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -76,12 +86,20 @@ public virtual Task<ClearCursorResponse> ClearCursorAsync(Action<ClearCursorRequ
 		return DoRequestAsync<ClearCursorRequestDescriptor, ClearCursorResponse, ClearCursorRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Deletes an async SQL search or a stored synchronous SQL search. If the search is still running, the API cancels it.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-async-sql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeleteAsyncResponse DeleteAsyncSearch(DeleteAsyncRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeleteAsyncRequest, DeleteAsyncResponse, DeleteAsyncRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Deletes an async SQL search or a stored synchronous SQL search. If the search is still running, the API cancels it.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-async-sql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeleteAsyncResponse> DeleteAsyncSearchAsync(DeleteAsyncRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -134,12 +152,20 @@ public virtual Task<DeleteAsyncResponse> DeleteAsyncSearchAsync<TDocument>(Elast
 		return DoRequestAsync<DeleteAsyncRequestDescriptor<TDocument>, DeleteAsyncResponse, DeleteAsyncRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns the current status and available results for an async SQL search or stored synchronous SQL search</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/get-async-sql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetAsyncResponse GetAsyncSearch(GetAsyncRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetAsyncRequest, GetAsyncResponse, GetAsyncRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns the current status and available results for an async SQL search or stored synchronous SQL search</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/get-async-sql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetAsyncResponse> GetAsyncSearchAsync(GetAsyncRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -192,12 +218,20 @@ public virtual Task<GetAsyncResponse> GetAsyncSearchAsync<TDocument>(Elastic.Cli
 		return DoRequestAsync<GetAsyncRequestDescriptor<TDocument>, GetAsyncResponse, GetAsyncRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns the current status of an async SQL search or a stored synchronous SQL search</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/get-async-sql-search-status-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetAsyncStatusResponse GetAsyncSearchStatus(GetAsyncStatusRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetAsyncStatusRequest, GetAsyncStatusResponse, GetAsyncStatusRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns the current status of an async SQL search or a stored synchronous SQL search</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/get-async-sql-search-status-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetAsyncStatusResponse> GetAsyncSearchStatusAsync(GetAsyncStatusRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -250,12 +284,20 @@ public virtual Task<GetAsyncStatusResponse> GetAsyncSearchStatusAsync<TDocument>
 		return DoRequestAsync<GetAsyncStatusRequestDescriptor<TDocument>, GetAsyncStatusResponse, GetAsyncStatusRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Executes a SQL request</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual QueryResponse Query(QueryRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<QueryRequest, QueryResponse, QueryRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Executes a SQL request</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<QueryResponse> QueryAsync(QueryRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.g.cs
index 7f5eb76100b..fefe4b381c5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.AsyncSearch;
 using Elastic.Clients.Elasticsearch.Cluster;
 using Elastic.Clients.Elasticsearch.Eql;
@@ -25,38 +27,36 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public partial class ElasticsearchClient
 {
 	public virtual AsyncSearchNamespacedClient AsyncSearch { get; private set; }
-
 	public virtual ClusterNamespacedClient Cluster { get; private set; }
-
 	public virtual EqlNamespacedClient Eql { get; private set; }
-
 	public virtual IndicesNamespacedClient Indices { get; private set; }
-
 	public virtual IngestNamespacedClient Ingest { get; private set; }
-
 	public virtual SqlNamespacedClient Sql { get; private set; }
 
 	private partial void SetupNamespaces()
 	{
-		AsyncSearch = new AsyncSearchNamespacedClient(this);
-		Cluster = new ClusterNamespacedClient(this);
-		Eql = new EqlNamespacedClient(this);
-		Indices = new IndicesNamespacedClient(this);
-		Ingest = new IngestNamespacedClient(this);
-		Sql = new SqlNamespacedClient(this);
+		AsyncSearch = new AsyncSearchNamespacedClient(this); Cluster = new ClusterNamespacedClient(this); Eql = new EqlNamespacedClient(this); Indices = new IndicesNamespacedClient(this); Ingest = new IngestNamespacedClient(this); Sql = new SqlNamespacedClient(this);
 	}
 
+	/// <summary>
+	/// <para>Allows to perform multiple index/update/delete operations in a single request.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/docs-bulk.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual BulkResponse Bulk(BulkRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<BulkRequest, BulkResponse, BulkRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Allows to perform multiple index/update/delete operations in a single request.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/docs-bulk.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<BulkResponse> BulkAsync(BulkRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -109,12 +109,20 @@ public virtual Task<BulkResponse> BulkAsync<TDocument>(Action<BulkRequestDescrip
 		return DoRequestAsync<BulkRequestDescriptor<TDocument>, BulkResponse, BulkRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Explicitly clears the search context for a scroll.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/clear-scroll-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ClearScrollResponse ClearScroll(ClearScrollRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ClearScrollRequest, ClearScrollResponse, ClearScrollRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Explicitly clears the search context for a scroll.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/clear-scroll-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ClearScrollResponse> ClearScrollAsync(ClearScrollRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -151,12 +159,20 @@ public virtual Task<ClearScrollResponse> ClearScrollAsync(Action<ClearScrollRequ
 		return DoRequestAsync<ClearScrollRequestDescriptor, ClearScrollResponse, ClearScrollRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Close a point in time</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/point-in-time-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ClosePointInTimeResponse ClosePointInTime(ClosePointInTimeRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ClosePointInTimeRequest, ClosePointInTimeResponse, ClosePointInTimeRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Close a point in time</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/point-in-time-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ClosePointInTimeResponse> ClosePointInTimeAsync(ClosePointInTimeRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -193,12 +209,20 @@ public virtual Task<ClosePointInTimeResponse> ClosePointInTimeAsync(Action<Close
 		return DoRequestAsync<ClosePointInTimeRequestDescriptor, ClosePointInTimeResponse, ClosePointInTimeRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns number of documents matching a query.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-count.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual CountResponse Count(CountRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<CountRequest, CountResponse, CountRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns number of documents matching a query.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-count.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<CountResponse> CountAsync(CountRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -251,12 +275,22 @@ public virtual Task<CountResponse> CountAsync<TDocument>(Action<CountRequestDesc
 		return DoRequestAsync<CountRequestDescriptor<TDocument>, CountResponse, CountRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Creates a new document in the index.</para>
+	/// <para>Returns a 409 response when a document with a same ID already exists in the index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual CreateResponse Create<TDocument>(CreateRequest<TDocument> request)
 	{
 		request.BeforeRequest();
 		return DoRequest<CreateRequest<TDocument>, CreateResponse, CreateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Creates a new document in the index.</para>
+	/// <para>Returns a 409 response when a document with a same ID already exists in the index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<CreateResponse> CreateAsync<TDocument>(CreateRequest<TDocument> request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -323,12 +357,20 @@ public virtual Task<CreateResponse> CreateAsync<TDocument>(TDocument document, A
 		return DoRequestAsync<CreateRequestDescriptor<TDocument>, CreateResponse, CreateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Deletes documents matching the provided query.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeleteByQueryResponse DeleteByQuery(DeleteByQueryRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeleteByQueryRequest, DeleteByQueryResponse, DeleteByQueryRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Deletes documents matching the provided query.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeleteByQueryResponse> DeleteByQueryAsync(DeleteByQueryRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -381,12 +423,20 @@ public virtual Task<DeleteByQueryResponse> DeleteByQueryAsync<TDocument>(Elastic
 		return DoRequestAsync<DeleteByQueryRequestDescriptor<TDocument>, DeleteByQueryResponse, DeleteByQueryRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Changes the number of requests per second for a particular Delete By Query operation.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeleteByQueryRethrottleResponse DeleteByQueryRethrottle(DeleteByQueryRethrottleRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeleteByQueryRethrottleRequest, DeleteByQueryRethrottleResponse, DeleteByQueryRethrottleRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Changes the number of requests per second for a particular Delete By Query operation.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeleteByQueryRethrottleResponse> DeleteByQueryRethrottleAsync(DeleteByQueryRethrottleRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -423,12 +473,20 @@ public virtual Task<DeleteByQueryRethrottleResponse> DeleteByQueryRethrottleAsyn
 		return DoRequestAsync<DeleteByQueryRethrottleRequestDescriptor, DeleteByQueryRethrottleResponse, DeleteByQueryRethrottleRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Removes a document from the index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeleteResponse Delete(DeleteRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeleteRequest, DeleteResponse, DeleteRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Removes a document from the index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeleteResponse> DeleteAsync(DeleteRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -511,12 +569,20 @@ public virtual Task<DeleteResponse> DeleteAsync<TDocument>(Elastic.Clients.Elast
 		return DoRequestAsync<DeleteRequestDescriptor<TDocument>, DeleteResponse, DeleteRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Deletes a script.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual DeleteScriptResponse DeleteScript(DeleteScriptRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<DeleteScriptRequest, DeleteScriptResponse, DeleteScriptRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Deletes a script.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<DeleteScriptResponse> DeleteScriptAsync(DeleteScriptRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -569,12 +635,20 @@ public virtual Task<DeleteScriptResponse> DeleteScriptAsync<TDocument>(Elastic.C
 		return DoRequestAsync<DeleteScriptRequestDescriptor<TDocument>, DeleteScriptResponse, DeleteScriptRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a document exists in an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ExistsResponse Exists(ExistsRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ExistsRequest, ExistsResponse, ExistsRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a document exists in an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ExistsResponse> ExistsAsync(ExistsRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -657,12 +731,20 @@ public virtual Task<ExistsResponse> ExistsAsync<TDocument>(Elastic.Clients.Elast
 		return DoRequestAsync<ExistsRequestDescriptor<TDocument>, ExistsResponse, ExistsRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a document source exists in an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ExistsSourceResponse ExistsSource(ExistsSourceRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ExistsSourceRequest, ExistsSourceResponse, ExistsSourceRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns information about whether a document source exists in an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ExistsSourceResponse> ExistsSourceAsync(ExistsSourceRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -745,12 +827,20 @@ public virtual Task<ExistsSourceResponse> ExistsSourceAsync<TDocument>(Elastic.C
 		return DoRequestAsync<ExistsSourceRequestDescriptor<TDocument>, ExistsSourceResponse, ExistsSourceRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns information about why a specific matches (or doesn't match) a query.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-explain.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ExplainResponse<TDocument> Explain<TDocument>(ExplainRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ExplainRequest, ExplainResponse<TDocument>, ExplainRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns information about why a specific matches (or doesn't match) a query.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-explain.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ExplainResponse<TDocument>> ExplainAsync<TDocument>(ExplainRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -817,12 +907,20 @@ public virtual Task<ExplainResponse<TDocument>> ExplainAsync<TDocument>(Elastic.
 		return DoRequestAsync<ExplainRequestDescriptor<TDocument>, ExplainResponse<TDocument>, ExplainRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns the information about the capabilities of fields among multiple indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-field-caps.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual FieldCapsResponse FieldCaps(FieldCapsRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<FieldCapsRequest, FieldCapsResponse, FieldCapsRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns the information about the capabilities of fields among multiple indices.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-field-caps.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<FieldCapsResponse> FieldCapsAsync(FieldCapsRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -875,12 +973,20 @@ public virtual Task<FieldCapsResponse> FieldCapsAsync<TDocument>(Action<FieldCap
 		return DoRequestAsync<FieldCapsRequestDescriptor<TDocument>, FieldCapsResponse, FieldCapsRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns a document.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetResponse<TDocument> Get<TDocument>(GetRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetRequest, GetResponse<TDocument>, GetRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns a document.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetResponse<TDocument>> GetAsync<TDocument>(GetRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -947,12 +1053,20 @@ public virtual Task<GetResponse<TDocument>> GetAsync<TDocument>(Elastic.Clients.
 		return DoRequestAsync<GetRequestDescriptor<TDocument>, GetResponse<TDocument>, GetRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns all script contexts.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/painless/master/painless-contexts.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetScriptContextResponse GetScriptContext(GetScriptContextRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetScriptContextRequest, GetScriptContextResponse, GetScriptContextRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns all script contexts.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/painless/master/painless-contexts.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetScriptContextResponse> GetScriptContextAsync(GetScriptContextRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -989,12 +1103,20 @@ public virtual Task<GetScriptContextResponse> GetScriptContextAsync(Action<GetSc
 		return DoRequestAsync<GetScriptContextRequestDescriptor, GetScriptContextResponse, GetScriptContextRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns available script types, languages and contexts</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetScriptLanguagesResponse GetScriptLanguages(GetScriptLanguagesRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetScriptLanguagesRequest, GetScriptLanguagesResponse, GetScriptLanguagesRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns available script types, languages and contexts</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetScriptLanguagesResponse> GetScriptLanguagesAsync(GetScriptLanguagesRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1031,12 +1153,20 @@ public virtual Task<GetScriptLanguagesResponse> GetScriptLanguagesAsync(Action<G
 		return DoRequestAsync<GetScriptLanguagesRequestDescriptor, GetScriptLanguagesResponse, GetScriptLanguagesRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns a script.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetScriptResponse GetScript(GetScriptRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetScriptRequest, GetScriptResponse, GetScriptRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns a script.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetScriptResponse> GetScriptAsync(GetScriptRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1089,12 +1219,20 @@ public virtual Task<GetScriptResponse> GetScriptAsync<TDocument>(Elastic.Clients
 		return DoRequestAsync<GetScriptRequestDescriptor<TDocument>, GetScriptResponse, GetScriptRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns the source of a document.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual GetSourceResponse<TDocument> GetSource<TDocument>(GetSourceRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<GetSourceRequest, GetSourceResponse<TDocument>, GetSourceRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns the source of a document.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<GetSourceResponse<TDocument>> GetSourceAsync<TDocument>(GetSourceRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1161,12 +1299,20 @@ public virtual Task<GetSourceResponse<TDocument>> GetSourceAsync<TDocument>(Elas
 		return DoRequestAsync<GetSourceRequestDescriptor<TDocument>, GetSourceResponse<TDocument>, GetSourceRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates a document in an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual IndexResponse Index<TDocument>(IndexRequest<TDocument> request)
 	{
 		request.BeforeRequest();
 		return DoRequest<IndexRequest<TDocument>, IndexResponse, IndexRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates a document in an index.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<IndexResponse> IndexAsync<TDocument>(IndexRequest<TDocument> request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1233,12 +1379,20 @@ public virtual Task<IndexResponse> IndexAsync<TDocument>(TDocument document, Act
 		return DoRequestAsync<IndexRequestDescriptor<TDocument>, IndexResponse, IndexRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns basic information about the cluster.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual InfoResponse Info(InfoRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<InfoRequest, InfoResponse, InfoRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns basic information about the cluster.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<InfoResponse> InfoAsync(InfoRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1275,12 +1429,20 @@ public virtual Task<InfoResponse> InfoAsync(Action<InfoRequestDescriptor> config
 		return DoRequestAsync<InfoRequestDescriptor, InfoResponse, InfoRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Allows to get multiple documents in one request.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-multi-get.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual MultiGetResponse<TDocument> MultiGet<TDocument>(MultiGetRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<MultiGetRequest, MultiGetResponse<TDocument>, MultiGetRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Allows to get multiple documents in one request.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-multi-get.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<MultiGetResponse<TDocument>> MultiGetAsync<TDocument>(MultiGetRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1317,12 +1479,20 @@ public virtual Task<MultiGetResponse<TDocument>> MultiGetAsync<TDocument>(Action
 		return DoRequestAsync<MultiGetRequestDescriptor<TDocument>, MultiGetResponse<TDocument>, MultiGetRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Allows to execute several search operations in one request.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-multi-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual MultiSearchResponse<TDocument> MultiSearch<TDocument>(MultiSearchRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<MultiSearchRequest, MultiSearchResponse<TDocument>, MultiSearchRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Allows to execute several search operations in one request.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-multi-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<MultiSearchResponse<TDocument>> MultiSearchAsync<TDocument>(MultiSearchRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1359,12 +1529,20 @@ public virtual Task<MultiSearchResponse<TDocument>> MultiSearchAsync<TDocument>(
 		return DoRequestAsync<MultiSearchRequestDescriptor<TDocument>, MultiSearchResponse<TDocument>, MultiSearchRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Allows to execute several search template operations in one request.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual MultiSearchTemplateResponse<TDocument> MultiSearchTemplate<TDocument>(MultiSearchTemplateRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<MultiSearchTemplateRequest, MultiSearchTemplateResponse<TDocument>, MultiSearchTemplateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Allows to execute several search template operations in one request.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<MultiSearchTemplateResponse<TDocument>> MultiSearchTemplateAsync<TDocument>(MultiSearchTemplateRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1401,12 +1579,20 @@ public virtual Task<MultiSearchTemplateResponse<TDocument>> MultiSearchTemplateA
 		return DoRequestAsync<MultiSearchTemplateRequestDescriptor<TDocument>, MultiSearchTemplateResponse<TDocument>, MultiSearchTemplateRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Open a point in time that can be used in subsequent searches</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/point-in-time-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual OpenPointInTimeResponse OpenPointInTime(OpenPointInTimeRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<OpenPointInTimeRequest, OpenPointInTimeResponse, OpenPointInTimeRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Open a point in time that can be used in subsequent searches</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/8.4/point-in-time-api.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<OpenPointInTimeResponse> OpenPointInTimeAsync(OpenPointInTimeRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1459,12 +1645,20 @@ public virtual Task<OpenPointInTimeResponse> OpenPointInTimeAsync<TDocument>(Ela
 		return DoRequestAsync<OpenPointInTimeRequestDescriptor<TDocument>, OpenPointInTimeResponse, OpenPointInTimeRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns whether the cluster is running.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual PingResponse Ping(PingRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<PingRequest, PingResponse, PingRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns whether the cluster is running.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<PingResponse> PingAsync(PingRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1501,12 +1695,20 @@ public virtual Task<PingResponse> PingAsync(Action<PingRequestDescriptor> config
 		return DoRequestAsync<PingRequestDescriptor, PingResponse, PingRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates a script.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual PutScriptResponse PutScript(PutScriptRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<PutScriptRequest, PutScriptResponse, PutScriptRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Creates or updates a script.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-scripting.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<PutScriptResponse> PutScriptAsync(PutScriptRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1559,12 +1761,20 @@ public virtual Task<PutScriptResponse> PutScriptAsync<TDocument>(Elastic.Clients
 		return DoRequestAsync<PutScriptRequestDescriptor<TDocument>, PutScriptResponse, PutScriptRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Allows to evaluate the quality of ranked search results over a set of typical search queries</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-rank-eval.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual RankEvalResponse RankEval(RankEvalRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<RankEvalRequest, RankEvalResponse, RankEvalRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Allows to evaluate the quality of ranked search results over a set of typical search queries</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-rank-eval.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<RankEvalResponse> RankEvalAsync(RankEvalRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1617,12 +1827,20 @@ public virtual Task<RankEvalResponse> RankEvalAsync<TDocument>(Action<RankEvalRe
 		return DoRequestAsync<RankEvalRequestDescriptor<TDocument>, RankEvalResponse, RankEvalRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Allows to copy documents from one index to another, optionally filtering the source<br/>documents by a query, changing the destination index settings, or fetching the<br/>documents from a remote cluster.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-reindex.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ReindexResponse Reindex(ReindexRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ReindexRequest, ReindexResponse, ReindexRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Allows to copy documents from one index to another, optionally filtering the source<br/>documents by a query, changing the destination index settings, or fetching the<br/>documents from a remote cluster.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-reindex.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ReindexResponse> ReindexAsync(ReindexRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1675,12 +1893,20 @@ public virtual Task<ReindexResponse> ReindexAsync<TDocument>(Action<ReindexReque
 		return DoRequestAsync<ReindexRequestDescriptor<TDocument>, ReindexResponse, ReindexRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Changes the number of requests per second for a particular Reindex operation.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-reindex.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ReindexRethrottleResponse ReindexRethrottle(ReindexRethrottleRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ReindexRethrottleRequest, ReindexRethrottleResponse, ReindexRethrottleRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Changes the number of requests per second for a particular Reindex operation.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-reindex.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ReindexRethrottleResponse> ReindexRethrottleAsync(ReindexRethrottleRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1717,12 +1943,20 @@ public virtual Task<ReindexRethrottleResponse> ReindexRethrottleAsync(Elastic.Cl
 		return DoRequestAsync<ReindexRethrottleRequestDescriptor, ReindexRethrottleResponse, ReindexRethrottleRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Allows to retrieve a large numbers of results from a single search request.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-body.html#request-body-search-scroll">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual ScrollResponse<TDocument> Scroll<TDocument>(ScrollRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<ScrollRequest, ScrollResponse<TDocument>, ScrollRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Allows to retrieve a large numbers of results from a single search request.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-body.html#request-body-search-scroll">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<ScrollResponse<TDocument>> ScrollAsync<TDocument>(ScrollRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1759,12 +1993,20 @@ public virtual Task<ScrollResponse<TDocument>> ScrollAsync<TDocument>(Action<Scr
 		return DoRequestAsync<ScrollRequestDescriptor, ScrollResponse<TDocument>, ScrollRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns results matching a query.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual SearchResponse<TDocument> Search<TDocument>(SearchRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<SearchRequest, SearchResponse<TDocument>, SearchRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns results matching a query.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-search.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<SearchResponse<TDocument>> SearchAsync<TDocument>(SearchRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1801,12 +2043,20 @@ public virtual Task<SearchResponse<TDocument>> SearchAsync<TDocument>(Action<Sea
 		return DoRequestAsync<SearchRequestDescriptor<TDocument>, SearchResponse<TDocument>, SearchRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Returns information about the indices and shards that a search request would be executed against.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-shards.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual SearchShardsResponse SearchShards(SearchShardsRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<SearchShardsRequest, SearchShardsResponse, SearchShardsRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Returns information about the indices and shards that a search request would be executed against.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-shards.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<SearchShardsResponse> SearchShardsAsync(SearchShardsRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1859,12 +2109,20 @@ public virtual Task<SearchShardsResponse> SearchShardsAsync<TDocument>(Action<Se
 		return DoRequestAsync<SearchShardsRequestDescriptor<TDocument>, SearchShardsResponse, SearchShardsRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>The terms enum API  can be used to discover terms in the index that begin with the provided string. It is designed for low-latency look-ups used in auto-complete scenarios.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-terms-enum.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual TermsEnumResponse TermsEnum(TermsEnumRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<TermsEnumRequest, TermsEnumResponse, TermsEnumRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>The terms enum API  can be used to discover terms in the index that begin with the provided string. It is designed for low-latency look-ups used in auto-complete scenarios.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-terms-enum.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<TermsEnumResponse> TermsEnumAsync(TermsEnumRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -1947,12 +2205,20 @@ public virtual Task<TermsEnumResponse> TermsEnumAsync<TDocument>(Elastic.Clients
 		return DoRequestAsync<TermsEnumRequestDescriptor<TDocument>, TermsEnumResponse, TermsEnumRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Performs an update on every document in the index without changing the source,<br/>for example to pick up a mapping change.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update-by-query.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual UpdateByQueryResponse UpdateByQuery(UpdateByQueryRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<UpdateByQueryRequest, UpdateByQueryResponse, UpdateByQueryRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Performs an update on every document in the index without changing the source,<br/>for example to pick up a mapping change.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update-by-query.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<UpdateByQueryResponse> UpdateByQueryAsync(UpdateByQueryRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -2005,12 +2271,20 @@ public virtual Task<UpdateByQueryResponse> UpdateByQueryAsync<TDocument>(Elastic
 		return DoRequestAsync<UpdateByQueryRequestDescriptor<TDocument>, UpdateByQueryResponse, UpdateByQueryRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Changes the number of requests per second for a particular Update By Query operation.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update-by-query.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual UpdateByQueryRethrottleResponse UpdateByQueryRethrottle(UpdateByQueryRethrottleRequest request)
 	{
 		request.BeforeRequest();
 		return DoRequest<UpdateByQueryRethrottleRequest, UpdateByQueryRethrottleResponse, UpdateByQueryRethrottleRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Changes the number of requests per second for a particular Update By Query operation.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update-by-query.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<UpdateByQueryRethrottleResponse> UpdateByQueryRethrottleAsync(UpdateByQueryRethrottleRequest request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
@@ -2047,12 +2321,20 @@ public virtual Task<UpdateByQueryRethrottleResponse> UpdateByQueryRethrottleAsyn
 		return DoRequestAsync<UpdateByQueryRethrottleRequestDescriptor, UpdateByQueryRethrottleResponse, UpdateByQueryRethrottleRequestParameters>(descriptor);
 	}
 
+	/// <summary>
+	/// <para>Updates a document with a script or partial document.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual UpdateResponse<TDocument> Update<TDocument, TPartialDocument>(UpdateRequest<TDocument, TPartialDocument> request)
 	{
 		request.BeforeRequest();
 		return DoRequest<UpdateRequest<TDocument, TPartialDocument>, UpdateResponse<TDocument>, UpdateRequestParameters>(request);
 	}
 
+	/// <summary>
+	/// <para>Updates a document with a script or partial document.</para>
+	/// <para><see href="https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update.html">Learn more about this API in the Elasticsearch documentation.</see></para>
+	/// </summary>
 	public virtual Task<UpdateResponse<TDocument>> UpdateAsync<TDocument, TPartialDocument>(UpdateRequest<TDocument, TPartialDocument> request, CancellationToken cancellationToken = default)
 	{
 		request.BeforeRequest();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/AggregateOrderConverter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/AggregateOrderConverter.g.cs
index eacc477791f..6540f0fcf98 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/AggregateOrderConverter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/AggregateOrderConverter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 internal sealed class AggregateOrderConverter : SingleOrManyCollectionConverter<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregate.g.cs
index 706320424b3..5b0e0007e35 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class AdjacencyMatrixAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.AdjacencyMatrixBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregation.g.cs
index 6ceea6b07c8..0c5b34bc63b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class AdjacencyMatrixAggregationConverter : JsonConverter<AdjacencyMatrixAggregation>
 {
 	public override AdjacencyMatrixAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -117,34 +119,29 @@ public override void Write(Utf8JsonWriter writer, AdjacencyMatrixAggregation val
 public sealed partial class AdjacencyMatrixAggregation : SearchAggregation
 {
 	public AdjacencyMatrixAggregation(string name) => Name = name;
+
 	internal AdjacencyMatrixAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public IDictionary<string, Elastic.Clients.Elasticsearch.QueryDsl.Query>? Filters { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
+	override public string? Name { get; internal set; }
 }
 
 public sealed partial class AdjacencyMatrixAggregationDescriptor<TDocument> : SerializableDescriptor<AdjacencyMatrixAggregationDescriptor<TDocument>>
 {
 	internal AdjacencyMatrixAggregationDescriptor(Action<AdjacencyMatrixAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public AdjacencyMatrixAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.QueryDsl.Query>? FiltersValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
 
 	public AdjacencyMatrixAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -224,18 +221,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class AdjacencyMatrixAggregationDescriptor : SerializableDescriptor<AdjacencyMatrixAggregationDescriptor>
 {
 	internal AdjacencyMatrixAggregationDescriptor(Action<AdjacencyMatrixAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public AdjacencyMatrixAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.QueryDsl.Query>? FiltersValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
 
 	public AdjacencyMatrixAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixBucket.g.cs
index f218033ef66..3260f4892a2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AdjacencyMatrixBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(AdjacencyMatrixBucketConverter))]
 public sealed partial class AdjacencyMatrixBucket : AggregateDictionary
 {
@@ -34,7 +36,6 @@ public AdjacencyMatrixBucket(IReadOnlyDictionary<string, IAggregate> backingDict
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public string Key { get; init; }
 }
@@ -45,7 +46,7 @@ internal sealed class AdjacencyMatrixBucketConverter : JsonConverter<AdjacencyMa
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		string key = default;
 		while (reader.Read())
@@ -54,7 +55,7 @@ internal sealed class AdjacencyMatrixBucketConverter : JsonConverter<AdjacencyMa
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -77,11 +78,7 @@ internal sealed class AdjacencyMatrixBucketConverter : JsonConverter<AdjacencyMa
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new AdjacencyMatrixBucket(subAggs)
-		{
-			DocCount = docCount,
-			Key = key
-		};
+		return new AdjacencyMatrixBucket(subAggs) { DocCount = docCount, Key = key };
 	}
 
 	public override void Write(Utf8JsonWriter writer, AdjacencyMatrixBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregateDictionary.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregateDictionary.g.cs
index 897e3b00b06..c4988260fb6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregateDictionary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregateDictionary.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(AggregateDictionaryConverter))]
 public partial class AggregateDictionary : IsAReadOnlyDictionary<string, IAggregate>
 {
@@ -82,6 +84,5 @@ public AggregateDictionary(IReadOnlyDictionary<string, IAggregate> backingDictio
 	public Elastic.Clients.Elasticsearch.Aggregations.RateAggregate? GetRate(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.RateAggregate?>(key);
 	public Elastic.Clients.Elasticsearch.Aggregations.CumulativeCardinalityAggregate? GetCumulativeCardinality(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.CumulativeCardinalityAggregate?>(key);
 	public Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsAggregate? GetMatrixStats(string key) => TryGet<Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsAggregate?>(key);
-	private TAggregate TryGet<TAggregate>(string key)
-		where TAggregate : class, IAggregate => BackingDictionary.TryGetValue(key, out var agg) ? agg as TAggregate : null;
+	private TAggregate TryGet<TAggregate>(string key) where TAggregate : class, IAggregate => BackingDictionary.TryGetValue(key, out var agg) ? agg as TAggregate : null;
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Aggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Aggregation.g.cs
index 23747b215ee..6f37db2e936 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Aggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Aggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,12 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(AggregationConverter))]
 public sealed partial class Aggregation
 {
 	internal Aggregation(ISearchAggregation variant) => Variant = variant ?? throw new ArgumentNullException(nameof(variant));
+
 	internal ISearchAggregation Variant { get; }
 }
 
@@ -297,6 +300,7 @@ public override void Write(Utf8JsonWriter writer, Aggregation value, JsonSeriali
 public sealed partial class AggregationDescriptor<TDocument> : SerializableDescriptor<AggregationDescriptor<TDocument>>
 {
 	internal AggregationDescriptor(Action<AggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public AggregationDescriptor() : base()
 	{
 	}
@@ -530,6 +534,7 @@ public AggregationDescriptor<TDocument> WeightedAvg(string name, Action<Weighted
 public sealed partial class AggregationDescriptor : SerializableDescriptor<AggregationDescriptor>
 {
 	internal AggregationDescriptor(Action<AggregationDescriptor> configure) => configure.Invoke(this);
+
 	public AggregationDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregationRange.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregationRange.g.cs
index d1f238d277c..5279c9e2cf2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregationRange.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AggregationRange.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class AggregationRange
 {
 	[JsonInclude, JsonPropertyName("from")]
 	public object? From { get; set; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public string? Key { get; set; }
-
 	[JsonInclude, JsonPropertyName("to")]
 	public object? To { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class AggregationRange
 public sealed partial class AggregationRangeDescriptor : SerializableDescriptor<AggregationRangeDescriptor>
 {
 	internal AggregationRangeDescriptor(Action<AggregationRangeDescriptor> configure) => configure.Invoke(this);
+
 	public AggregationRangeDescriptor() : base()
 	{
 	}
 
 	private object? FromValue { get; set; }
-
 	private string? KeyValue { get; set; }
-
 	private object? ToValue { get; set; }
 
 	public AggregationRangeDescriptor From(object? from)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ArrayPercentilesItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ArrayPercentilesItem.g.cs
index a1039ce8b57..2962cc1560e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ArrayPercentilesItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ArrayPercentilesItem.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class ArrayPercentilesItem
 {
 	[JsonInclude, JsonPropertyName("key")]
 	public string Key { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregate.g.cs
index 8b34a6e36b6..3119d139dbc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class AutoDateHistogramAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("interval")]
 	public string Interval { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
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 35ef60aee7c..305de99b9a9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AutoDateHistogramAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class AutoDateHistogramAggregationConverter : JsonConverter<AutoDateHistogramAggregation>
 {
 	public override AutoDateHistogramAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -261,66 +263,45 @@ public override void Write(Utf8JsonWriter writer, AutoDateHistogramAggregation v
 public sealed partial class AutoDateHistogramAggregation : SearchAggregation
 {
 	public AutoDateHistogramAggregation(string name) => Name = name;
+
 	internal AutoDateHistogramAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public int? Buckets { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.MinimumInterval? MinimumInterval { get; set; }
-
 	public DateTimeOffset? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public string? Offset { get; set; }
-
 	public IDictionary<string, object>? Params { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	public string? TimeZone { get; set; }
 }
 
 public sealed partial class AutoDateHistogramAggregationDescriptor<TDocument> : SerializableDescriptor<AutoDateHistogramAggregationDescriptor<TDocument>>
 {
 	internal AutoDateHistogramAggregationDescriptor(Action<AutoDateHistogramAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public AutoDateHistogramAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private int? BucketsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.MinimumInterval? MinimumIntervalValue { get; set; }
-
 	private DateTimeOffset? MissingValue { get; set; }
-
 	private string? OffsetValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? TimeZoneValue { get; set; }
 
 	public AutoDateHistogramAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -502,34 +483,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class AutoDateHistogramAggregationDescriptor : SerializableDescriptor<AutoDateHistogramAggregationDescriptor>
 {
 	internal AutoDateHistogramAggregationDescriptor(Action<AutoDateHistogramAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public AutoDateHistogramAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private int? BucketsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.MinimumInterval? MinimumIntervalValue { get; set; }
-
 	private DateTimeOffset? MissingValue { get; set; }
-
 	private string? OffsetValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? TimeZoneValue { get; set; }
 
 	public AutoDateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregation.g.cs
index 389b7122a23..26f32b48699 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AverageAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class AverageAggregationConverter : JsonConverter<AverageAggregation>
 {
 	public override AverageAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -155,38 +157,31 @@ public sealed partial class AverageAggregation : SearchAggregation
 {
 	public AverageAggregation(string name, Field field) : this(name) => Field = field;
 	public AverageAggregation(string name) => Name = name;
+
 	internal AverageAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class AverageAggregationDescriptor<TDocument> : SerializableDescriptor<AverageAggregationDescriptor<TDocument>>
 {
 	internal AverageAggregationDescriptor(Action<AverageAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public AverageAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public AverageAggregationDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -268,18 +263,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class AverageAggregationDescriptor : SerializableDescriptor<AverageAggregationDescriptor>
 {
 	internal AverageAggregationDescriptor(Action<AverageAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public AverageAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public AverageAggregationDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AvgAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AvgAggregate.g.cs
index 20a932c689f..f701e338a88 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AvgAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/AvgAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class AvgAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxPlotAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxPlotAggregate.g.cs
index b097ae36a6d..10671e5eb6d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxPlotAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxPlotAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,52 +25,38 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class BoxPlotAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("lower")]
 	public double Lower { get; init; }
-
 	[JsonInclude, JsonPropertyName("lower_as_string")]
 	public string? LowerAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("max")]
 	public double Max { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_as_string")]
 	public string? MaxAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("min")]
 	public double Min { get; init; }
-
 	[JsonInclude, JsonPropertyName("min_as_string")]
 	public string? MinAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("q1")]
 	public double Q1 { get; init; }
-
 	[JsonInclude, JsonPropertyName("q1_as_string")]
 	public string? Q1AsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("q2")]
 	public double Q2 { get; init; }
-
 	[JsonInclude, JsonPropertyName("q2_as_string")]
 	public string? Q2AsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("q3")]
 	public double Q3 { get; init; }
-
 	[JsonInclude, JsonPropertyName("q3_as_string")]
 	public string? Q3AsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("upper")]
 	public double Upper { get; init; }
-
 	[JsonInclude, JsonPropertyName("upper_as_string")]
 	public string? UpperAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxplotAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxplotAggregation.g.cs
index a737b81ea68..69df28c2b2e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxplotAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BoxplotAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class BoxplotAggregationConverter : JsonConverter<BoxplotAggregation>
 {
 	public override BoxplotAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -155,38 +157,31 @@ public sealed partial class BoxplotAggregation : SearchAggregation
 {
 	public BoxplotAggregation(string name, Field field) : this(name) => Field = field;
 	public BoxplotAggregation(string name) => Name = name;
+
 	internal BoxplotAggregation()
 	{
 	}
 
 	public double? Compression { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class BoxplotAggregationDescriptor<TDocument> : SerializableDescriptor<BoxplotAggregationDescriptor<TDocument>>
 {
 	internal BoxplotAggregationDescriptor(Action<BoxplotAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public BoxplotAggregationDescriptor() : base()
 	{
 	}
 
 	private double? CompressionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public BoxplotAggregationDescriptor<TDocument> Compression(double? compression)
@@ -268,18 +263,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class BoxplotAggregationDescriptor : SerializableDescriptor<BoxplotAggregationDescriptor>
 {
 	internal BoxplotAggregationDescriptor(Action<BoxplotAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public BoxplotAggregationDescriptor() : base()
 	{
 	}
 
 	private double? CompressionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public BoxplotAggregationDescriptor Compression(double? compression)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketSortAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketSortAggregation.g.cs
index 97044ecb22d..de16fd7dea7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketSortAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketSortAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class BucketSortAggregationConverter : JsonConverter<BucketSortAggregation>
 {
 	public override BucketSortAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -154,44 +156,34 @@ public override void Write(Utf8JsonWriter writer, BucketSortAggregation value, J
 public sealed partial class BucketSortAggregation : SearchAggregation
 {
 	public BucketSortAggregation(string name) => Name = name;
+
 	internal BucketSortAggregation()
 	{
 	}
 
 	public int? From { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicy { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public int? Size { get; set; }
-
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 }
 
 public sealed partial class BucketSortAggregationDescriptor<TDocument> : SerializableDescriptor<BucketSortAggregationDescriptor<TDocument>>
 {
 	internal BucketSortAggregationDescriptor(Action<BucketSortAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public BucketSortAggregationDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor<TDocument> SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>>[] SortDescriptorActions { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicyValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? SizeValue { get; set; }
 
 	public BucketSortAggregationDescriptor<TDocument> Sort(ICollection<Elastic.Clients.Elasticsearch.SortOptions>? sort)
@@ -320,24 +312,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class BucketSortAggregationDescriptor : SerializableDescriptor<BucketSortAggregationDescriptor>
 {
 	internal BucketSortAggregationDescriptor(Action<BucketSortAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public BucketSortAggregationDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor>[] SortDescriptorActions { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicyValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? SizeValue { get; set; }
 
 	public BucketSortAggregationDescriptor Sort(ICollection<Elastic.Clients.Elasticsearch.SortOptions>? sort)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Buckets.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Buckets.g.cs
index b3e68f198b9..b73fab8b19a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Buckets.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Buckets.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class Buckets<TBucket> : Union<IReadOnlyDictionary<string, TBucket>, IReadOnlyCollection<TBucket>>
 {
 	public Buckets(IReadOnlyDictionary<string, TBucket> dictionary) : base(dictionary)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregate.g.cs
index 77c4da1fc1b..945b2e1ae39 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class CardinalityAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public long Value { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregation.g.cs
index 4387db624e6..f8eca1823b5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CardinalityAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class CardinalityAggregationConverter : JsonConverter<CardinalityAggregation>
 {
 	public override CardinalityAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -191,46 +193,35 @@ public sealed partial class CardinalityAggregation : SearchAggregation
 {
 	public CardinalityAggregation(string name, Field field) : this(name) => Field = field;
 	public CardinalityAggregation(string name) => Name = name;
+
 	internal CardinalityAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.CardinalityExecutionMode? ExecutionHint { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public int? PrecisionThreshold { get; set; }
-
 	public bool? Rehash { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class CardinalityAggregationDescriptor<TDocument> : SerializableDescriptor<CardinalityAggregationDescriptor<TDocument>>
 {
 	internal CardinalityAggregationDescriptor(Action<CardinalityAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CardinalityAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.CardinalityExecutionMode? ExecutionHintValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private int? PrecisionThresholdValue { get; set; }
-
 	private bool? RehashValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public CardinalityAggregationDescriptor<TDocument> ExecutionHint(Elastic.Clients.Elasticsearch.Aggregations.CardinalityExecutionMode? executionHint)
@@ -336,22 +327,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class CardinalityAggregationDescriptor : SerializableDescriptor<CardinalityAggregationDescriptor>
 {
 	internal CardinalityAggregationDescriptor(Action<CardinalityAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public CardinalityAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.CardinalityExecutionMode? ExecutionHintValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private int? PrecisionThresholdValue { get; set; }
-
 	private bool? RehashValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public CardinalityAggregationDescriptor ExecutionHint(Elastic.Clients.Elasticsearch.Aggregations.CardinalityExecutionMode? executionHint)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregate.g.cs
index 192027c2def..570a27f212e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(ChildrenAggregateConverter))]
 public sealed partial class ChildrenAggregate : AggregateDictionary, IAggregate
 {
@@ -34,7 +36,6 @@ public ChildrenAggregate(IReadOnlyDictionary<string, IAggregate> backingDictiona
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
@@ -45,7 +46,7 @@ internal sealed class ChildrenAggregateConverter : JsonConverter<ChildrenAggrega
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		IReadOnlyDictionary<string, object>? meta = default;
 		while (reader.Read())
@@ -54,7 +55,7 @@ internal sealed class ChildrenAggregateConverter : JsonConverter<ChildrenAggrega
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -77,11 +78,7 @@ internal sealed class ChildrenAggregateConverter : JsonConverter<ChildrenAggrega
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new ChildrenAggregate(subAggs)
-		{
-			DocCount = docCount,
-			Meta = meta
-		};
+		return new ChildrenAggregate(subAggs) { DocCount = docCount, Meta = meta };
 	}
 
 	public override void Write(Utf8JsonWriter writer, ChildrenAggregate value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregation.g.cs
index dcf1991d631..5e2ec39b0f8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ChildrenAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class ChildrenAggregationConverter : JsonConverter<ChildrenAggregation>
 {
 	public override ChildrenAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -117,34 +119,29 @@ public override void Write(Utf8JsonWriter writer, ChildrenAggregation value, Jso
 public sealed partial class ChildrenAggregation : SearchAggregation
 {
 	public ChildrenAggregation(string name) => Name = name;
+
 	internal ChildrenAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public string? Type { get; set; }
 }
 
 public sealed partial class ChildrenAggregationDescriptor<TDocument> : SerializableDescriptor<ChildrenAggregationDescriptor<TDocument>>
 {
 	internal ChildrenAggregationDescriptor(Action<ChildrenAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ChildrenAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private string? TypeValue { get; set; }
 
 	public ChildrenAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -224,18 +221,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ChildrenAggregationDescriptor : SerializableDescriptor<ChildrenAggregationDescriptor>
 {
 	internal ChildrenAggregationDescriptor(Action<ChildrenAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public ChildrenAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private string? TypeValue { get; set; }
 
 	public ChildrenAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregate.g.cs
index 5d953b8ba10..9844bb06e7a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class CompositeAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("after_key")]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.FieldValue>? AfterKey { get; init; }
-
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.CompositeBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregation.g.cs
index f2f597c143b..d6cd1a2c223 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class CompositeAggregationConverter : JsonConverter<CompositeAggregation>
 {
 	public override CompositeAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -153,42 +155,33 @@ public override void Write(Utf8JsonWriter writer, CompositeAggregation value, Js
 public sealed partial class CompositeAggregation : SearchAggregation
 {
 	public CompositeAggregation(string name) => Name = name;
+
 	internal CompositeAggregation()
 	{
 	}
 
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.FieldValue>? After { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public int? Size { get; set; }
-
 	public ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregationSource>>? Sources { get; set; }
 }
 
 public sealed partial class CompositeAggregationDescriptor<TDocument> : SerializableDescriptor<CompositeAggregationDescriptor<TDocument>>
 {
 	internal CompositeAggregationDescriptor(Action<CompositeAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CompositeAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.FieldValue>? AfterValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregationSource>>? SourcesValue { get; set; }
 
 	public CompositeAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -292,22 +285,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class CompositeAggregationDescriptor : SerializableDescriptor<CompositeAggregationDescriptor>
 {
 	internal CompositeAggregationDescriptor(Action<CompositeAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public CompositeAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.FieldValue>? AfterValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Aggregations.CompositeAggregationSource>>? SourcesValue { get; set; }
 
 	public CompositeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregationSource.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregationSource.g.cs
index 6455c1689e8..72f34113ca3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregationSource.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeAggregationSource.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class CompositeAggregationSource
 {
 	[JsonInclude, JsonPropertyName("date_histogram")]
 	public Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation? DateHistogram { get; set; }
-
 	[JsonInclude, JsonPropertyName("histogram")]
 	public Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation? Histogram { get; set; }
-
 	[JsonInclude, JsonPropertyName("terms")]
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation? Terms { get; set; }
 }
@@ -40,26 +40,19 @@ public sealed partial class CompositeAggregationSource
 public sealed partial class CompositeAggregationSourceDescriptor<TDocument> : SerializableDescriptor<CompositeAggregationSourceDescriptor<TDocument>>
 {
 	internal CompositeAggregationSourceDescriptor(Action<CompositeAggregationSourceDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CompositeAggregationSourceDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation? DateHistogramValue { get; set; }
-
 	private DateHistogramAggregationDescriptor<TDocument> DateHistogramDescriptor { get; set; }
-
 	private Action<DateHistogramAggregationDescriptor<TDocument>> DateHistogramDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation? HistogramValue { get; set; }
-
 	private HistogramAggregationDescriptor<TDocument> HistogramDescriptor { get; set; }
-
 	private Action<HistogramAggregationDescriptor<TDocument>> HistogramDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation? TermsValue { get; set; }
-
 	private TermsAggregationDescriptor<TDocument> TermsDescriptor { get; set; }
-
 	private Action<TermsAggregationDescriptor<TDocument>> TermsDescriptorAction { get; set; }
 
 	public CompositeAggregationSourceDescriptor<TDocument> DateHistogram(Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation? dateHistogram)
@@ -192,26 +185,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class CompositeAggregationSourceDescriptor : SerializableDescriptor<CompositeAggregationSourceDescriptor>
 {
 	internal CompositeAggregationSourceDescriptor(Action<CompositeAggregationSourceDescriptor> configure) => configure.Invoke(this);
+
 	public CompositeAggregationSourceDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation? DateHistogramValue { get; set; }
-
 	private DateHistogramAggregationDescriptor DateHistogramDescriptor { get; set; }
-
 	private Action<DateHistogramAggregationDescriptor> DateHistogramDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.HistogramAggregation? HistogramValue { get; set; }
-
 	private HistogramAggregationDescriptor HistogramDescriptor { get; set; }
-
 	private Action<HistogramAggregationDescriptor> HistogramDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsAggregation? TermsValue { get; set; }
-
 	private TermsAggregationDescriptor TermsDescriptor { get; set; }
-
 	private Action<TermsAggregationDescriptor> TermsDescriptorAction { get; set; }
 
 	public CompositeAggregationSourceDescriptor DateHistogram(Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation? dateHistogram)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeBucket.g.cs
index 5a8eed42eb5..92563a7e784 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CompositeBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(CompositeBucketConverter))]
 public sealed partial class CompositeBucket : AggregateDictionary
 {
@@ -34,7 +36,6 @@ public CompositeBucket(IReadOnlyDictionary<string, IAggregate> backingDictionary
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.FieldValue> Key { get; init; }
 }
@@ -45,7 +46,7 @@ internal sealed class CompositeBucketConverter : JsonConverter<CompositeBucket>
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.FieldValue> key = default;
 		while (reader.Read())
@@ -54,7 +55,7 @@ internal sealed class CompositeBucketConverter : JsonConverter<CompositeBucket>
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -77,11 +78,7 @@ internal sealed class CompositeBucketConverter : JsonConverter<CompositeBucket>
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new CompositeBucket(subAggs)
-		{
-			DocCount = docCount,
-			Key = key
-		};
+		return new CompositeBucket(subAggs) { DocCount = docCount, Key = key };
 	}
 
 	public override void Write(Utf8JsonWriter writer, CompositeBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregate.g.cs
index 09253b01857..1374d38c459 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,17 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
+/// <summary>
+/// <para>Result of the `cumulative_cardinality` aggregation</para>
+/// </summary>
 public sealed partial class CumulativeCardinalityAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public long Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregation.g.cs
index 78ee7449e8c..5945599f054 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeCardinalityAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class CumulativeCardinalityAggregationConverter : JsonConverter<CumulativeCardinalityAggregation>
 {
 	public override CumulativeCardinalityAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -118,30 +120,27 @@ public override void Write(Utf8JsonWriter writer, CumulativeCardinalityAggregati
 public sealed partial class CumulativeCardinalityAggregation : SearchAggregation
 {
 	public CumulativeCardinalityAggregation(string name) => Name = name;
+
 	internal CumulativeCardinalityAggregation()
 	{
 	}
 
 	public string? Format { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicy { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
+	override public string? Name { get; internal set; }
 }
 
 public sealed partial class CumulativeCardinalityAggregationDescriptor : SerializableDescriptor<CumulativeCardinalityAggregationDescriptor>
 {
 	internal CumulativeCardinalityAggregationDescriptor(Action<CumulativeCardinalityAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public CumulativeCardinalityAggregationDescriptor() : base()
 	{
 	}
 
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicyValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
 
 	public CumulativeCardinalityAggregationDescriptor Format(string? format)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeSumAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeSumAggregation.g.cs
index 80db0304dcf..0b13493acf1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeSumAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/CumulativeSumAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class CumulativeSumAggregationConverter : JsonConverter<CumulativeSumAggregation>
 {
 	public override CumulativeSumAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -118,30 +120,27 @@ public override void Write(Utf8JsonWriter writer, CumulativeSumAggregation value
 public sealed partial class CumulativeSumAggregation : SearchAggregation
 {
 	public CumulativeSumAggregation(string name) => Name = name;
+
 	internal CumulativeSumAggregation()
 	{
 	}
 
 	public string? Format { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicy { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
+	override public string? Name { get; internal set; }
 }
 
 public sealed partial class CumulativeSumAggregationDescriptor : SerializableDescriptor<CumulativeSumAggregationDescriptor>
 {
 	internal CumulativeSumAggregationDescriptor(Action<CumulativeSumAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public CumulativeSumAggregationDescriptor() : base()
 	{
 	}
 
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicyValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
 
 	public CumulativeSumAggregationDescriptor Format(string? format)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregate.g.cs
index 80f23ce8ab0..f1e0896cdb3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class DateHistogramAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.DateHistogramBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
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 27ba479c5aa..aa56f0e844c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class DateHistogramAggregationConverter : JsonConverter<DateHistogramAggregation>
 {
 	public override DateHistogramAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -297,75 +299,50 @@ public override void Write(Utf8JsonWriter writer, DateHistogramAggregation value
 public sealed partial class DateHistogramAggregation : SearchAggregation
 {
 	public DateHistogramAggregation(string name) => Name = name;
+
 	internal DateHistogramAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.CalendarInterval? CalendarInterval { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Duration? FixedInterval { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public int? MinDocCount { get; set; }
-
 	public DateTimeOffset? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Duration? Offset { get; set; }
-
 	[JsonConverter(typeof(AggregateOrderConverter))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? Order { get; set; }
-
 	public IDictionary<string, object>? Params { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	public string? TimeZone { get; set; }
 }
 
 public sealed partial class DateHistogramAggregationDescriptor<TDocument> : SerializableDescriptor<DateHistogramAggregationDescriptor<TDocument>>
 {
 	internal DateHistogramAggregationDescriptor(Action<DateHistogramAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DateHistogramAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.CalendarInterval? CalendarIntervalValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? FixedIntervalValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? MinDocCountValue { get; set; }
-
 	private DateTimeOffset? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? OffsetValue { get; set; }
-
 	private ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? OrderValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? TimeZoneValue { get; set; }
 
 	public DateHistogramAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -571,38 +548,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DateHistogramAggregationDescriptor : SerializableDescriptor<DateHistogramAggregationDescriptor>
 {
 	internal DateHistogramAggregationDescriptor(Action<DateHistogramAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public DateHistogramAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.CalendarInterval? CalendarIntervalValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? FixedIntervalValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? MinDocCountValue { get; set; }
-
 	private DateTimeOffset? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? OffsetValue { get; set; }
-
 	private ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? OrderValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? TimeZoneValue { get; set; }
 
 	public DateHistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
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 b9a37576fe8..0a45f3f22e1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(DateHistogramBucketConverter))]
 public sealed partial class DateHistogramBucket : AggregateDictionary
 {
@@ -34,10 +36,8 @@ public DateHistogramBucket(IReadOnlyDictionary<string, IAggregate> backingDictio
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public long Key { get; init; }
-
 	[JsonInclude, JsonPropertyName("key_as_string")]
 	public string? KeyAsString { get; init; }
 }
@@ -48,7 +48,7 @@ internal sealed class DateHistogramBucketConverter : JsonConverter<DateHistogram
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		long key = default;
 		string? keyAsString = default;
@@ -58,7 +58,7 @@ internal sealed class DateHistogramBucketConverter : JsonConverter<DateHistogram
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -87,12 +87,7 @@ internal sealed class DateHistogramBucketConverter : JsonConverter<DateHistogram
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new DateHistogramBucket(subAggs)
-		{
-			DocCount = docCount,
-			Key = key,
-			KeyAsString = keyAsString
-		};
+		return new DateHistogramBucket(subAggs) { DocCount = docCount, Key = key, KeyAsString = keyAsString };
 	}
 
 	public override void Write(Utf8JsonWriter writer, DateHistogramBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregate.g.cs
index d4f3213cad8..ced271ee75c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,15 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
+/// <summary>
+/// <para>Result of a `date_range` aggregation. Same format as a for a `range` aggregation: `from` and `to`<br/>in `buckets` are milliseconds since the Epoch, represented as a floating point number.</para>
+/// </summary>
 public sealed partial class DateRangeAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.RangeBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
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 5ec1c68b1f0..a428fe766b0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class DateRangeAggregationConverter : JsonConverter<DateRangeAggregation>
 {
 	public override DateRangeAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -189,56 +191,40 @@ public override void Write(Utf8JsonWriter writer, DateRangeAggregation value, Js
 public sealed partial class DateRangeAggregation : SearchAggregation
 {
 	public DateRangeAggregation(string name) => Name = name;
+
 	internal DateRangeAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public ICollection<Elastic.Clients.Elasticsearch.Aggregations.DateRangeExpression>? Ranges { get; set; }
-
 	public string? TimeZone { get; set; }
 }
 
 public sealed partial class DateRangeAggregationDescriptor<TDocument> : SerializableDescriptor<DateRangeAggregationDescriptor<TDocument>>
 {
 	internal DateRangeAggregationDescriptor(Action<DateRangeAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DateRangeAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Aggregations.DateRangeExpression>? RangesValue { get; set; }
-
 	private DateRangeExpressionDescriptor RangesDescriptor { get; set; }
-
 	private Action<DateRangeExpressionDescriptor> RangesDescriptorAction { get; set; }
-
 	private Action<DateRangeExpressionDescriptor>[] RangesDescriptorActions { get; set; }
-
 	private string? TimeZoneValue { get; set; }
 
 	public DateRangeAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -427,32 +413,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DateRangeAggregationDescriptor : SerializableDescriptor<DateRangeAggregationDescriptor>
 {
 	internal DateRangeAggregationDescriptor(Action<DateRangeAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public DateRangeAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Aggregations.DateRangeExpression>? RangesValue { get; set; }
-
 	private DateRangeExpressionDescriptor RangesDescriptor { get; set; }
-
 	private Action<DateRangeExpressionDescriptor> RangesDescriptorAction { get; set; }
-
 	private Action<DateRangeExpressionDescriptor>[] RangesDescriptorActions { get; set; }
-
 	private string? TimeZoneValue { get; set; }
 
 	public DateRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeExpression.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeExpression.g.cs
index cd0e75a175d..40ece9f1609 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeExpression.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateRangeExpression.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class DateRangeExpression
 {
 	[JsonInclude, JsonPropertyName("from")]
 	public Elastic.Clients.Elasticsearch.Aggregations.FieldDateMath? From { get; set; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public string? Key { get; set; }
-
 	[JsonInclude, JsonPropertyName("to")]
 	public Elastic.Clients.Elasticsearch.Aggregations.FieldDateMath? To { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class DateRangeExpression
 public sealed partial class DateRangeExpressionDescriptor : SerializableDescriptor<DateRangeExpressionDescriptor>
 {
 	internal DateRangeExpressionDescriptor(Action<DateRangeExpressionDescriptor> configure) => configure.Invoke(this);
+
 	public DateRangeExpressionDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.FieldDateMath? FromValue { get; set; }
-
 	private string? KeyValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.FieldDateMath? ToValue { get; set; }
 
 	public DateRangeExpressionDescriptor From(Elastic.Clients.Elasticsearch.Aggregations.FieldDateMath? from)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregate.g.cs
index f89aa5495d6..3aa34960282 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class DerivativeAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("normalized_value")]
 	public double? NormalizedValue { get; init; }
-
 	[JsonInclude, JsonPropertyName("normalized_value_as_string")]
 	public string? NormalizedValueAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregation.g.cs
index 3f77d405b3b..b2e6eecd6a8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DerivativeAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class DerivativeAggregationConverter : JsonConverter<DerivativeAggregation>
 {
 	public override DerivativeAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -118,30 +120,27 @@ public override void Write(Utf8JsonWriter writer, DerivativeAggregation value, J
 public sealed partial class DerivativeAggregation : SearchAggregation
 {
 	public DerivativeAggregation(string name) => Name = name;
+
 	internal DerivativeAggregation()
 	{
 	}
 
 	public string? Format { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicy { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
+	override public string? Name { get; internal set; }
 }
 
 public sealed partial class DerivativeAggregationDescriptor : SerializableDescriptor<DerivativeAggregationDescriptor>
 {
 	internal DerivativeAggregationDescriptor(Action<DerivativeAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public DerivativeAggregationDescriptor() : base()
 	{
 	}
 
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicyValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
 
 	public DerivativeAggregationDescriptor Format(string? format)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsAggregate.g.cs
index 198e1e40bb9..02b3177f06c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
+/// <summary>
+/// <para>Result of a `terms` aggregation when the field is some kind of decimal number like a float, double, or distance.</para>
+/// </summary>
 public sealed partial class DoubleTermsAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.DoubleTermsBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("doc_count_error_upper_bound")]
 	public long? DocCountErrorUpperBound { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsBucket.g.cs
index cd5d7f4830d..11666342eb1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DoubleTermsBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(DoubleTermsBucketConverter))]
 public sealed partial class DoubleTermsBucket : AggregateDictionary
 {
@@ -34,13 +36,10 @@ public DoubleTermsBucket(IReadOnlyDictionary<string, IAggregate> backingDictiona
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("doc_count_error")]
 	public long? DocCountError { get; init; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public double Key { get; init; }
-
 	[JsonInclude, JsonPropertyName("key_as_string")]
 	public string? KeyAsString { get; init; }
 }
@@ -51,7 +50,7 @@ internal sealed class DoubleTermsBucketConverter : JsonConverter<DoubleTermsBuck
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		long? docCountError = default;
 		double key = default;
@@ -62,7 +61,7 @@ internal sealed class DoubleTermsBucketConverter : JsonConverter<DoubleTermsBuck
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -97,13 +96,7 @@ internal sealed class DoubleTermsBucketConverter : JsonConverter<DoubleTermsBuck
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new DoubleTermsBucket(subAggs)
-		{
-			DocCount = docCount,
-			DocCountError = docCountError,
-			Key = key,
-			KeyAsString = keyAsString
-		};
+		return new DoubleTermsBucket(subAggs) { DocCount = docCount, DocCountError = docCountError, Key = key, KeyAsString = keyAsString };
 	}
 
 	public override void Write(Utf8JsonWriter writer, DoubleTermsBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregate.g.cs
index bfef99573c0..bac3a657435 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,79 +25,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class ExtendedStatsAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("avg")]
 	public double? Avg { get; init; }
-
 	[JsonInclude, JsonPropertyName("avg_as_string")]
 	public string? AvgAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-
 	[JsonInclude, JsonPropertyName("max")]
 	public double? Max { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_as_string")]
 	public string? MaxAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("min")]
 	public double? Min { get; init; }
-
 	[JsonInclude, JsonPropertyName("min_as_string")]
 	public string? MinAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation")]
 	public double? StdDeviation { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation_as_string")]
 	public string? StdDeviationAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation_bounds")]
 	public Elastic.Clients.Elasticsearch.Aggregations.StandardDeviationBounds? StdDeviationBounds { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation_bounds_as_string")]
 	public Elastic.Clients.Elasticsearch.Aggregations.StandardDeviationBoundsAsString? StdDeviationBoundsAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation_population")]
 	public double? StdDeviationPopulation { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation_sampling")]
 	public double? StdDeviationSampling { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum")]
 	public double Sum { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_as_string")]
 	public string? SumAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_of_squares")]
 	public double? SumOfSquares { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_of_squares_as_string")]
 	public string? SumOfSquaresAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance")]
 	public double? Variance { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance_as_string")]
 	public string? VarianceAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance_population")]
 	public double? VariancePopulation { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance_population_as_string")]
 	public string? VariancePopulationAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance_sampling")]
 	public double? VarianceSampling { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance_sampling_as_string")]
 	public string? VarianceSamplingAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregation.g.cs
index 33572198ec6..5e86cf72f1d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class ExtendedStatsAggregationConverter : JsonConverter<ExtendedStatsAggregation>
 {
 	public override ExtendedStatsAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -173,42 +175,33 @@ public sealed partial class ExtendedStatsAggregation : SearchAggregation
 {
 	public ExtendedStatsAggregation(string name, Field field) : this(name) => Field = field;
 	public ExtendedStatsAggregation(string name) => Name = name;
+
 	internal ExtendedStatsAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	public double? Sigma { get; set; }
 }
 
 public sealed partial class ExtendedStatsAggregationDescriptor<TDocument> : SerializableDescriptor<ExtendedStatsAggregationDescriptor<TDocument>>
 {
 	internal ExtendedStatsAggregationDescriptor(Action<ExtendedStatsAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ExtendedStatsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private double? SigmaValue { get; set; }
 
 	public ExtendedStatsAggregationDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -302,20 +295,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ExtendedStatsAggregationDescriptor : SerializableDescriptor<ExtendedStatsAggregationDescriptor>
 {
 	internal ExtendedStatsAggregationDescriptor(Action<ExtendedStatsAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public ExtendedStatsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private double? SigmaValue { get; set; }
 
 	public ExtendedStatsAggregationDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregate.g.cs
index 69acb1cc305..745361506c4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,79 +25,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class ExtendedStatsBucketAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("avg")]
 	public double? Avg { get; init; }
-
 	[JsonInclude, JsonPropertyName("avg_as_string")]
 	public string? AvgAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-
 	[JsonInclude, JsonPropertyName("max")]
 	public double? Max { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_as_string")]
 	public string? MaxAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("min")]
 	public double? Min { get; init; }
-
 	[JsonInclude, JsonPropertyName("min_as_string")]
 	public string? MinAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation")]
 	public double? StdDeviation { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation_as_string")]
 	public string? StdDeviationAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation_bounds")]
 	public Elastic.Clients.Elasticsearch.Aggregations.StandardDeviationBounds? StdDeviationBounds { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation_bounds_as_string")]
 	public Elastic.Clients.Elasticsearch.Aggregations.StandardDeviationBoundsAsString? StdDeviationBoundsAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation_population")]
 	public double? StdDeviationPopulation { get; init; }
-
 	[JsonInclude, JsonPropertyName("std_deviation_sampling")]
 	public double? StdDeviationSampling { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum")]
 	public double Sum { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_as_string")]
 	public string? SumAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_of_squares")]
 	public double? SumOfSquares { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_of_squares_as_string")]
 	public string? SumOfSquaresAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance")]
 	public double? Variance { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance_as_string")]
 	public string? VarianceAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance_population")]
 	public double? VariancePopulation { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance_population_as_string")]
 	public string? VariancePopulationAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance_sampling")]
 	public double? VarianceSampling { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance_sampling_as_string")]
 	public string? VarianceSamplingAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregation.g.cs
index 976ad809847..0508e9a1b15 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ExtendedStatsBucketAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class ExtendedStatsBucketAggregationConverter : JsonConverter<ExtendedStatsBucketAggregation>
 {
 	public override ExtendedStatsBucketAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -136,34 +138,29 @@ public override void Write(Utf8JsonWriter writer, ExtendedStatsBucketAggregation
 public sealed partial class ExtendedStatsBucketAggregation : SearchAggregation
 {
 	public ExtendedStatsBucketAggregation(string name) => Name = name;
+
 	internal ExtendedStatsBucketAggregation()
 	{
 	}
 
 	public string? Format { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicy { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public double? Sigma { get; set; }
 }
 
 public sealed partial class ExtendedStatsBucketAggregationDescriptor : SerializableDescriptor<ExtendedStatsBucketAggregationDescriptor>
 {
 	internal ExtendedStatsBucketAggregationDescriptor(Action<ExtendedStatsBucketAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public ExtendedStatsBucketAggregationDescriptor() : base()
 	{
 	}
 
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicyValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private double? SigmaValue { get; set; }
 
 	public ExtendedStatsBucketAggregationDescriptor Format(string? format)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FieldDateMath.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FieldDateMath.g.cs
index 49677b2aefe..ce2e172824c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FieldDateMath.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FieldDateMath.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class FieldDateMath : Union<Elastic.Clients.Elasticsearch.DateMath, double>
 {
 	public FieldDateMath(Elastic.Clients.Elasticsearch.DateMath expr) : base(expr)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FilterAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FilterAggregate.g.cs
index 6c7cff7db1d..8ceceef101a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FilterAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FilterAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(FilterAggregateConverter))]
 public sealed partial class FilterAggregate : AggregateDictionary, IAggregate
 {
@@ -34,7 +36,6 @@ public FilterAggregate(IReadOnlyDictionary<string, IAggregate> backingDictionary
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
@@ -45,7 +46,7 @@ internal sealed class FilterAggregateConverter : JsonConverter<FilterAggregate>
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		IReadOnlyDictionary<string, object>? meta = default;
 		while (reader.Read())
@@ -54,7 +55,7 @@ internal sealed class FilterAggregateConverter : JsonConverter<FilterAggregate>
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -77,11 +78,7 @@ internal sealed class FilterAggregateConverter : JsonConverter<FilterAggregate>
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new FilterAggregate(subAggs)
-		{
-			DocCount = docCount,
-			Meta = meta
-		};
+		return new FilterAggregate(subAggs) { DocCount = docCount, Meta = meta };
 	}
 
 	public override void Write(Utf8JsonWriter writer, FilterAggregate value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregate.g.cs
index ca8671509e5..7dcc5086217 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class FiltersAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.FiltersBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregation.g.cs
index 81ab0327d5a..bd1a5faa5f5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class FiltersAggregationConverter : JsonConverter<FiltersAggregation>
 {
 	public override FiltersAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -153,42 +155,33 @@ public override void Write(Utf8JsonWriter writer, FiltersAggregation value, Json
 public sealed partial class FiltersAggregation : SearchAggregation
 {
 	public FiltersAggregation(string name) => Name = name;
+
 	internal FiltersAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.Buckets<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Filters { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public bool? OtherBucket { get; set; }
-
 	public string? OtherBucketKey { get; set; }
 }
 
 public sealed partial class FiltersAggregationDescriptor<TDocument> : SerializableDescriptor<FiltersAggregationDescriptor<TDocument>>
 {
 	internal FiltersAggregationDescriptor(Action<FiltersAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FiltersAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.Buckets<Elastic.Clients.Elasticsearch.QueryDsl.Query>? FiltersValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private bool? OtherBucketValue { get; set; }
-
 	private string? OtherBucketKeyValue { get; set; }
 
 	public FiltersAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -292,22 +285,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FiltersAggregationDescriptor : SerializableDescriptor<FiltersAggregationDescriptor>
 {
 	internal FiltersAggregationDescriptor(Action<FiltersAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public FiltersAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.Buckets<Elastic.Clients.Elasticsearch.QueryDsl.Query>? FiltersValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private bool? OtherBucketValue { get; set; }
-
 	private string? OtherBucketKeyValue { get; set; }
 
 	public FiltersAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersBucket.g.cs
index fa8d3e0b1de..49b384b3c60 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/FiltersBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(FiltersBucketConverter))]
 public sealed partial class FiltersBucket : AggregateDictionary
 {
@@ -42,7 +44,7 @@ internal sealed class FiltersBucketConverter : JsonConverter<FiltersBucket>
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		while (reader.Read())
 		{
@@ -50,7 +52,7 @@ internal sealed class FiltersBucketConverter : JsonConverter<FiltersBucket>
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -67,10 +69,7 @@ internal sealed class FiltersBucketConverter : JsonConverter<FiltersBucket>
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new FiltersBucket(subAggs)
-		{
-			DocCount = docCount
-		};
+		return new FiltersBucket(subAggs) { DocCount = docCount };
 	}
 
 	public override void Write(Utf8JsonWriter writer, FiltersBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregate.g.cs
index 4038e5b71c6..7b669e164e4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(GlobalAggregateConverter))]
 public sealed partial class GlobalAggregate : AggregateDictionary, IAggregate
 {
@@ -34,7 +36,6 @@ public GlobalAggregate(IReadOnlyDictionary<string, IAggregate> backingDictionary
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
@@ -45,7 +46,7 @@ internal sealed class GlobalAggregateConverter : JsonConverter<GlobalAggregate>
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		IReadOnlyDictionary<string, object>? meta = default;
 		while (reader.Read())
@@ -54,7 +55,7 @@ internal sealed class GlobalAggregateConverter : JsonConverter<GlobalAggregate>
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -77,11 +78,7 @@ internal sealed class GlobalAggregateConverter : JsonConverter<GlobalAggregate>
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new GlobalAggregate(subAggs)
-		{
-			DocCount = docCount,
-			Meta = meta
-		};
+		return new GlobalAggregate(subAggs) { DocCount = docCount, Meta = meta };
 	}
 
 	public override void Write(Utf8JsonWriter writer, GlobalAggregate value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregation.g.cs
index eeff09f62e1..e714d2b3699 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/GlobalAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class GlobalAggregationConverter : JsonConverter<GlobalAggregation>
 {
 	public override GlobalAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -100,30 +102,27 @@ public override void Write(Utf8JsonWriter writer, GlobalAggregation value, JsonS
 public sealed partial class GlobalAggregation : SearchAggregation
 {
 	public GlobalAggregation(string name) => Name = name;
+
 	internal GlobalAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
+	override public string? Name { get; internal set; }
 }
 
 public sealed partial class GlobalAggregationDescriptor<TDocument> : SerializableDescriptor<GlobalAggregationDescriptor<TDocument>>
 {
 	internal GlobalAggregationDescriptor(Action<GlobalAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GlobalAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
 
 	public GlobalAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -191,16 +190,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class GlobalAggregationDescriptor : SerializableDescriptor<GlobalAggregationDescriptor>
 {
 	internal GlobalAggregationDescriptor(Action<GlobalAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public GlobalAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
 
 	public GlobalAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregate.g.cs
index eba3eaa51d4..e96f1a21eda 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class HistogramAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.HistogramBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs
index 9197f77936e..bba12dc7cf1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class HistogramAggregationConverter : JsonConverter<HistogramAggregation>
 {
 	public override HistogramAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -243,63 +245,44 @@ public override void Write(Utf8JsonWriter writer, HistogramAggregation value, Js
 public sealed partial class HistogramAggregation : SearchAggregation
 {
 	public HistogramAggregation(string name) => Name = name;
+
 	internal HistogramAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public double? Interval { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public int? MinDocCount { get; set; }
-
 	public double? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public double? Offset { get; set; }
-
 	[JsonConverter(typeof(AggregateOrderConverter))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? Order { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class HistogramAggregationDescriptor<TDocument> : SerializableDescriptor<HistogramAggregationDescriptor<TDocument>>
 {
 	internal HistogramAggregationDescriptor(Action<HistogramAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public HistogramAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private double? IntervalValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? MinDocCountValue { get; set; }
-
 	private double? MissingValue { get; set; }
-
 	private double? OffsetValue { get; set; }
-
 	private ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? OrderValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public HistogramAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -469,32 +452,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class HistogramAggregationDescriptor : SerializableDescriptor<HistogramAggregationDescriptor>
 {
 	internal HistogramAggregationDescriptor(Action<HistogramAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public HistogramAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private double? IntervalValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? MinDocCountValue { get; set; }
-
 	private double? MissingValue { get; set; }
-
 	private double? OffsetValue { get; set; }
-
 	private ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? OrderValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public HistogramAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramBucket.g.cs
index 1e9da670875..4826e85da11 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(HistogramBucketConverter))]
 public sealed partial class HistogramBucket : AggregateDictionary
 {
@@ -34,10 +36,8 @@ public HistogramBucket(IReadOnlyDictionary<string, IAggregate> backingDictionary
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public double Key { get; init; }
-
 	[JsonInclude, JsonPropertyName("key_as_string")]
 	public string? KeyAsString { get; init; }
 }
@@ -48,7 +48,7 @@ internal sealed class HistogramBucketConverter : JsonConverter<HistogramBucket>
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		double key = default;
 		string? keyAsString = default;
@@ -58,7 +58,7 @@ internal sealed class HistogramBucketConverter : JsonConverter<HistogramBucket>
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -87,12 +87,7 @@ internal sealed class HistogramBucketConverter : JsonConverter<HistogramBucket>
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new HistogramBucket(subAggs)
-		{
-			DocCount = docCount,
-			Key = key,
-			KeyAsString = keyAsString
-		};
+		return new HistogramBucket(subAggs) { DocCount = docCount, Key = key, KeyAsString = keyAsString };
 	}
 
 	public override void Write(Utf8JsonWriter writer, HistogramBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregate.g.cs
index 6993c75bd27..8acc72f90b0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class InferenceAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("data")]
 	public IReadOnlyDictionary<string, object> Data { get; init; }
-
 	[JsonInclude, JsonPropertyName("feature_importance")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.InferenceFeatureImportance>? FeatureImportance { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("top_classes")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.InferenceTopClassEntry>? TopClasses { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public Elastic.Clients.Elasticsearch.FieldValue? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("warning")]
 	public string? Warning { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregation.g.cs
index 2c590b9ac3b..adeac39b62b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class InferenceAggregationConverter : JsonConverter<InferenceAggregation>
 {
 	public override InferenceAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -150,42 +152,33 @@ public override void Write(Utf8JsonWriter writer, InferenceAggregation value, Js
 public sealed partial class InferenceAggregation : SearchAggregation
 {
 	public InferenceAggregation(string name) => Name = name;
+
 	internal InferenceAggregation()
 	{
 	}
 
 	public string? Format { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicy { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.InferenceConfig? InferenceConfig { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Name ModelId { get; set; }
-
-	public override string? Name { get; internal set; }
+	override public string? Name { get; internal set; }
 }
 
 public sealed partial class InferenceAggregationDescriptor<TDocument> : SerializableDescriptor<InferenceAggregationDescriptor<TDocument>>
 {
 	internal InferenceAggregationDescriptor(Action<InferenceAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public InferenceAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.InferenceConfig? InferenceConfigValue { get; set; }
-
 	private InferenceConfigDescriptor<TDocument> InferenceConfigDescriptor { get; set; }
-
 	private Action<InferenceConfigDescriptor<TDocument>> InferenceConfigDescriptorAction { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicyValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Name ModelIdValue { get; set; }
 
 	public InferenceAggregationDescriptor<TDocument> InferenceConfig(Elastic.Clients.Elasticsearch.Aggregations.InferenceConfig? inferenceConfig)
@@ -285,22 +278,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class InferenceAggregationDescriptor : SerializableDescriptor<InferenceAggregationDescriptor>
 {
 	internal InferenceAggregationDescriptor(Action<InferenceAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public InferenceAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.InferenceConfig? InferenceConfigValue { get; set; }
-
 	private InferenceConfigDescriptor InferenceConfigDescriptor { get; set; }
-
 	private Action<InferenceConfigDescriptor> InferenceConfigDescriptorAction { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicyValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Name ModelIdValue { get; set; }
 
 	public InferenceAggregationDescriptor InferenceConfig(Elastic.Clients.Elasticsearch.Aggregations.InferenceConfig? inferenceConfig)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceClassImportance.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceClassImportance.g.cs
index fa70c47aa65..9c4a5079fb7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceClassImportance.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceClassImportance.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class InferenceClassImportance
 {
 	[JsonInclude, JsonPropertyName("class_name")]
 	public string ClassName { get; init; }
-
 	[JsonInclude, JsonPropertyName("importance")]
 	public double Importance { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfig.g.cs
index de209c6bb42..d73c21bf359 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfig.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(InferenceConfigConverter))]
 public sealed partial class InferenceConfig
 {
@@ -41,7 +43,6 @@ internal InferenceConfig(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static InferenceConfig Classification(Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfig("classification", classificationInferenceOptions);
@@ -103,20 +104,17 @@ public override void Write(Utf8JsonWriter writer, InferenceConfig value, JsonSer
 public sealed partial class InferenceConfigDescriptor<TDocument> : SerializableDescriptor<InferenceConfigDescriptor<TDocument>>
 {
 	internal InferenceConfigDescriptor(Action<InferenceConfigDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public InferenceConfigDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private InferenceConfigDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private InferenceConfigDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -138,6 +136,7 @@ private InferenceConfigDescriptor<TDocument> Set(object variant, string variantN
 	public InferenceConfigDescriptor<TDocument> Classification(Action<Ml.ClassificationInferenceOptionsDescriptor> configure) => Set(configure, "classification");
 	public InferenceConfigDescriptor<TDocument> Regression(Ml.RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression");
 	public InferenceConfigDescriptor<TDocument> Regression(Action<Ml.RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -163,20 +162,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class InferenceConfigDescriptor : SerializableDescriptor<InferenceConfigDescriptor>
 {
 	internal InferenceConfigDescriptor(Action<InferenceConfigDescriptor> configure) => configure.Invoke(this);
+
 	public InferenceConfigDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private InferenceConfigDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private InferenceConfigDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -199,6 +195,7 @@ private InferenceConfigDescriptor Set(object variant, string variantName)
 	public InferenceConfigDescriptor Regression(Ml.RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression");
 	public InferenceConfigDescriptor Regression(Action<Ml.RegressionInferenceOptionsDescriptor> configure) => Set(configure, "regression");
 	public InferenceConfigDescriptor Regression<TDocument>(Action<Ml.RegressionInferenceOptionsDescriptor<TDocument>> configure) => Set(configure, "regression");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceFeatureImportance.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceFeatureImportance.g.cs
index 87b1aafa607..98b53963ced 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceFeatureImportance.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceFeatureImportance.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class InferenceFeatureImportance
 {
 	[JsonInclude, JsonPropertyName("classes")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.InferenceClassImportance>? Classes { get; init; }
-
 	[JsonInclude, JsonPropertyName("feature_name")]
 	public string FeatureName { get; init; }
-
 	[JsonInclude, JsonPropertyName("importance")]
 	public double? Importance { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceTopClassEntry.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceTopClassEntry.g.cs
index 336cfd50a1a..1bf5a622b72 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceTopClassEntry.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceTopClassEntry.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class InferenceTopClassEntry
 {
 	[JsonInclude, JsonPropertyName("class_name")]
 	public Elastic.Clients.Elasticsearch.FieldValue ClassName { get; init; }
-
 	[JsonInclude, JsonPropertyName("class_probability")]
 	public double ClassProbability { get; init; }
-
 	[JsonInclude, JsonPropertyName("class_score")]
 	public double ClassScore { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregate.g.cs
index bc8c84768df..b29a4b1c35b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class IpRangeAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.IpRangeBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregation.g.cs
index 07e6ebb7f01..499bfe5b1d2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class IpRangeAggregationConverter : JsonConverter<IpRangeAggregation>
 {
 	public override IpRangeAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -135,44 +137,34 @@ public override void Write(Utf8JsonWriter writer, IpRangeAggregation value, Json
 public sealed partial class IpRangeAggregation : SearchAggregation
 {
 	public IpRangeAggregation(string name) => Name = name;
+
 	internal IpRangeAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public ICollection<Elastic.Clients.Elasticsearch.Aggregations.IpRangeAggregationRange>? Ranges { get; set; }
 }
 
 public sealed partial class IpRangeAggregationDescriptor<TDocument> : SerializableDescriptor<IpRangeAggregationDescriptor<TDocument>>
 {
 	internal IpRangeAggregationDescriptor(Action<IpRangeAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IpRangeAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Aggregations.IpRangeAggregationRange>? RangesValue { get; set; }
-
 	private IpRangeAggregationRangeDescriptor RangesDescriptor { get; set; }
-
 	private Action<IpRangeAggregationRangeDescriptor> RangesDescriptorAction { get; set; }
-
 	private Action<IpRangeAggregationRangeDescriptor>[] RangesDescriptorActions { get; set; }
 
 	public IpRangeAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -325,26 +317,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IpRangeAggregationDescriptor : SerializableDescriptor<IpRangeAggregationDescriptor>
 {
 	internal IpRangeAggregationDescriptor(Action<IpRangeAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public IpRangeAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Aggregations.IpRangeAggregationRange>? RangesValue { get; set; }
-
 	private IpRangeAggregationRangeDescriptor RangesDescriptor { get; set; }
-
 	private Action<IpRangeAggregationRangeDescriptor> RangesDescriptorAction { get; set; }
-
 	private Action<IpRangeAggregationRangeDescriptor>[] RangesDescriptorActions { get; set; }
 
 	public IpRangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregationRange.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregationRange.g.cs
index 0ff88c25adf..b182e8f0d30 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregationRange.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeAggregationRange.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class IpRangeAggregationRange
 {
 	[JsonInclude, JsonPropertyName("from")]
 	public string? From { get; set; }
-
 	[JsonInclude, JsonPropertyName("mask")]
 	public string? Mask { get; set; }
-
 	[JsonInclude, JsonPropertyName("to")]
 	public string? To { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class IpRangeAggregationRange
 public sealed partial class IpRangeAggregationRangeDescriptor : SerializableDescriptor<IpRangeAggregationRangeDescriptor>
 {
 	internal IpRangeAggregationRangeDescriptor(Action<IpRangeAggregationRangeDescriptor> configure) => configure.Invoke(this);
+
 	public IpRangeAggregationRangeDescriptor() : base()
 	{
 	}
 
 	private string? FromValue { get; set; }
-
 	private string? MaskValue { get; set; }
-
 	private string? ToValue { get; set; }
 
 	public IpRangeAggregationRangeDescriptor From(string? from)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeBucket.g.cs
index 56a92e95da9..aac1ce12b6a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/IpRangeBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(IpRangeBucketConverter))]
 public sealed partial class IpRangeBucket : AggregateDictionary
 {
@@ -34,13 +36,10 @@ public IpRangeBucket(IReadOnlyDictionary<string, IAggregate> backingDictionary)
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("from")]
 	public string? From { get; init; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public string? Key { get; init; }
-
 	[JsonInclude, JsonPropertyName("to")]
 	public string? To { get; init; }
 }
@@ -51,7 +50,7 @@ internal sealed class IpRangeBucketConverter : JsonConverter<IpRangeBucket>
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		string? from = default;
 		string? key = default;
@@ -62,7 +61,7 @@ internal sealed class IpRangeBucketConverter : JsonConverter<IpRangeBucket>
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -97,13 +96,7 @@ internal sealed class IpRangeBucketConverter : JsonConverter<IpRangeBucket>
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new IpRangeBucket(subAggs)
-		{
-			DocCount = docCount,
-			From = from,
-			Key = key,
-			To = to
-		};
+		return new IpRangeBucket(subAggs) { DocCount = docCount, From = from, Key = key, To = to };
 	}
 
 	public override void Write(Utf8JsonWriter writer, IpRangeBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsAggregate.g.cs
index 29154d904d9..6ce24c9bf9a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
+/// <summary>
+/// <para>Result of a `terms` aggregation when the field is some kind of whole number like a integer, long, or a date.</para>
+/// </summary>
 public sealed partial class LongTermsAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.LongTermsBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("doc_count_error_upper_bound")]
 	public long? DocCountErrorUpperBound { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsBucket.g.cs
index 7b920d3c0a5..518266a14b0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/LongTermsBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(LongTermsBucketConverter))]
 public sealed partial class LongTermsBucket : AggregateDictionary
 {
@@ -34,13 +36,10 @@ public LongTermsBucket(IReadOnlyDictionary<string, IAggregate> backingDictionary
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("doc_count_error")]
 	public long? DocCountError { get; init; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public long Key { get; init; }
-
 	[JsonInclude, JsonPropertyName("key_as_string")]
 	public string? KeyAsString { get; init; }
 }
@@ -51,7 +50,7 @@ internal sealed class LongTermsBucketConverter : JsonConverter<LongTermsBucket>
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		long? docCountError = default;
 		long key = default;
@@ -62,7 +61,7 @@ internal sealed class LongTermsBucketConverter : JsonConverter<LongTermsBucket>
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -97,13 +96,7 @@ internal sealed class LongTermsBucketConverter : JsonConverter<LongTermsBucket>
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new LongTermsBucket(subAggs)
-		{
-			DocCount = docCount,
-			DocCountError = docCountError,
-			Key = key,
-			KeyAsString = keyAsString
-		};
+		return new LongTermsBucket(subAggs) { DocCount = docCount, DocCountError = docCountError, Key = key, KeyAsString = keyAsString };
 	}
 
 	public override void Write(Utf8JsonWriter writer, LongTermsBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregate.g.cs
index 3507d6fa63c..79f70d28227 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class MatrixStatsAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.MatrixStatsFields> Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs
index dabf70a8f5f..1dc7291f804 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class MatrixStatsAggregationConverter : JsonConverter<MatrixStatsAggregation>
 {
 	public override MatrixStatsAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -136,34 +138,29 @@ public override void Write(Utf8JsonWriter writer, MatrixStatsAggregation value,
 public sealed partial class MatrixStatsAggregation : SearchAggregation
 {
 	public MatrixStatsAggregation(string name) => Name = name;
+
 	internal MatrixStatsAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, double>? Missing { get; set; }
-
 	public Elastic.Clients.Elasticsearch.SortMode? Mode { get; set; }
-
-	public override string? Name { get; internal set; }
+	override public string? Name { get; internal set; }
 }
 
 public sealed partial class MatrixStatsAggregationDescriptor<TDocument> : SerializableDescriptor<MatrixStatsAggregationDescriptor<TDocument>>
 {
 	internal MatrixStatsAggregationDescriptor(Action<MatrixStatsAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MatrixStatsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? FieldsValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, double>? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortMode? ModeValue { get; set; }
 
 	public MatrixStatsAggregationDescriptor<TDocument> Fields(Elastic.Clients.Elasticsearch.Fields? fields)
@@ -227,16 +224,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MatrixStatsAggregationDescriptor : SerializableDescriptor<MatrixStatsAggregationDescriptor>
 {
 	internal MatrixStatsAggregationDescriptor(Action<MatrixStatsAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public MatrixStatsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? FieldsValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, double>? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortMode? ModeValue { get; set; }
 
 	public MatrixStatsAggregationDescriptor Fields(Elastic.Clients.Elasticsearch.Fields? fields)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsFields.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsFields.g.cs
index 2bf72e92efd..f1b01e2dbb5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsFields.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MatrixStatsFields.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,33 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class MatrixStatsFields
 {
 	[JsonInclude, JsonPropertyName("correlation")]
 	[ReadOnlyFieldDictionaryConverter(typeof(double))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, double> Correlation { get; init; }
-
 	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-
 	[JsonInclude, JsonPropertyName("covariance")]
 	[ReadOnlyFieldDictionaryConverter(typeof(double))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, double> Covariance { get; init; }
-
 	[JsonInclude, JsonPropertyName("kurtosis")]
 	public double Kurtosis { get; init; }
-
 	[JsonInclude, JsonPropertyName("mean")]
 	public double Mean { get; init; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-
 	[JsonInclude, JsonPropertyName("skewness")]
 	public double Skewness { get; init; }
-
 	[JsonInclude, JsonPropertyName("variance")]
 	public double Variance { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregate.g.cs
index 003300a44ff..8c832e9a81e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class MaxAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregation.g.cs
index 64336a01514..73b24c2b608 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MaxAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class MaxAggregationConverter : JsonConverter<MaxAggregation>
 {
 	public override MaxAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -155,38 +157,31 @@ public sealed partial class MaxAggregation : SearchAggregation
 {
 	public MaxAggregation(string name, Field field) : this(name) => Field = field;
 	public MaxAggregation(string name) => Name = name;
+
 	internal MaxAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class MaxAggregationDescriptor<TDocument> : SerializableDescriptor<MaxAggregationDescriptor<TDocument>>
 {
 	internal MaxAggregationDescriptor(Action<MaxAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MaxAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public MaxAggregationDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -268,18 +263,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MaxAggregationDescriptor : SerializableDescriptor<MaxAggregationDescriptor>
 {
 	internal MaxAggregationDescriptor(Action<MaxAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public MaxAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public MaxAggregationDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregate.g.cs
index 0e9615cb529..3412897a555 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class MedianAbsoluteDeviationAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregation.g.cs
index 29488ba1eec..f8288d23c13 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MedianAbsoluteDeviationAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class MedianAbsoluteDeviationAggregationConverter : JsonConverter<MedianAbsoluteDeviationAggregation>
 {
 	public override MedianAbsoluteDeviationAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -173,42 +175,33 @@ public sealed partial class MedianAbsoluteDeviationAggregation : SearchAggregati
 {
 	public MedianAbsoluteDeviationAggregation(string name, Field field) : this(name) => Field = field;
 	public MedianAbsoluteDeviationAggregation(string name) => Name = name;
+
 	internal MedianAbsoluteDeviationAggregation()
 	{
 	}
 
 	public double? Compression { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class MedianAbsoluteDeviationAggregationDescriptor<TDocument> : SerializableDescriptor<MedianAbsoluteDeviationAggregationDescriptor<TDocument>>
 {
 	internal MedianAbsoluteDeviationAggregationDescriptor(Action<MedianAbsoluteDeviationAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MedianAbsoluteDeviationAggregationDescriptor() : base()
 	{
 	}
 
 	private double? CompressionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public MedianAbsoluteDeviationAggregationDescriptor<TDocument> Compression(double? compression)
@@ -302,20 +295,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MedianAbsoluteDeviationAggregationDescriptor : SerializableDescriptor<MedianAbsoluteDeviationAggregationDescriptor>
 {
 	internal MedianAbsoluteDeviationAggregationDescriptor(Action<MedianAbsoluteDeviationAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public MedianAbsoluteDeviationAggregationDescriptor() : base()
 	{
 	}
 
 	private double? CompressionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public MedianAbsoluteDeviationAggregationDescriptor Compression(double? compression)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregate.g.cs
index dadbf0582d7..1db309c45bc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class MinAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregation.g.cs
index e118da2fb36..6acd68e9e59 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MinAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class MinAggregationConverter : JsonConverter<MinAggregation>
 {
 	public override MinAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -155,38 +157,31 @@ public sealed partial class MinAggregation : SearchAggregation
 {
 	public MinAggregation(string name, Field field) : this(name) => Field = field;
 	public MinAggregation(string name) => Name = name;
+
 	internal MinAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class MinAggregationDescriptor<TDocument> : SerializableDescriptor<MinAggregationDescriptor<TDocument>>
 {
 	internal MinAggregationDescriptor(Action<MinAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MinAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public MinAggregationDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -268,18 +263,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MinAggregationDescriptor : SerializableDescriptor<MinAggregationDescriptor>
 {
 	internal MinAggregationDescriptor(Action<MinAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public MinAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public MinAggregationDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregate.g.cs
index 6ca44c7e74d..75bcb6e70b7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(MissingAggregateConverter))]
 public sealed partial class MissingAggregate : AggregateDictionary, IAggregate
 {
@@ -34,7 +36,6 @@ public MissingAggregate(IReadOnlyDictionary<string, IAggregate> backingDictionar
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
@@ -45,7 +46,7 @@ internal sealed class MissingAggregateConverter : JsonConverter<MissingAggregate
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		IReadOnlyDictionary<string, object>? meta = default;
 		while (reader.Read())
@@ -54,7 +55,7 @@ internal sealed class MissingAggregateConverter : JsonConverter<MissingAggregate
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -77,11 +78,7 @@ internal sealed class MissingAggregateConverter : JsonConverter<MissingAggregate
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new MissingAggregate(subAggs)
-		{
-			DocCount = docCount,
-			Meta = meta
-		};
+		return new MissingAggregate(subAggs) { DocCount = docCount, Meta = meta };
 	}
 
 	public override void Write(Utf8JsonWriter writer, MissingAggregate value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregation.g.cs
index d9b9d961394..c36e842f9e5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MissingAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class MissingAggregationConverter : JsonConverter<MissingAggregation>
 {
 	public override MissingAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -135,38 +137,31 @@ public override void Write(Utf8JsonWriter writer, MissingAggregation value, Json
 public sealed partial class MissingAggregation : SearchAggregation
 {
 	public MissingAggregation(string name) => Name = name;
+
 	internal MissingAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
+	override public string? Name { get; internal set; }
 }
 
 public sealed partial class MissingAggregationDescriptor<TDocument> : SerializableDescriptor<MissingAggregationDescriptor<TDocument>>
 {
 	internal MissingAggregationDescriptor(Action<MissingAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MissingAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
 
 	public MissingAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -264,20 +259,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MissingAggregationDescriptor : SerializableDescriptor<MissingAggregationDescriptor>
 {
 	internal MissingAggregationDescriptor(Action<MissingAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public MissingAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
 
 	public MissingAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermLookup.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermLookup.g.cs
index 1502ec9a500..9c115bf219e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermLookup.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermLookup.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class MultiTermLookup
 {
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("missing")]
 	public FieldValue? Missing { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class MultiTermLookup
 public sealed partial class MultiTermLookupDescriptor<TDocument> : SerializableDescriptor<MultiTermLookupDescriptor<TDocument>>
 {
 	internal MultiTermLookupDescriptor(Action<MultiTermLookupDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MultiTermLookupDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
 
 	public MultiTermLookupDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field field)
@@ -81,12 +82,12 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MultiTermLookupDescriptor : SerializableDescriptor<MultiTermLookupDescriptor>
 {
 	internal MultiTermLookupDescriptor(Action<MultiTermLookupDescriptor> configure) => configure.Invoke(this);
+
 	public MultiTermLookupDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
 
 	public MultiTermLookupDescriptor Field(Elastic.Clients.Elasticsearch.Field field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregate.g.cs
index 29e20446206..8b9a14cd9a2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class MultiTermsAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.MultiTermsBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("doc_count_error_upper_bound")]
 	public long? DocCountErrorUpperBound { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs
index bedea79b370..4f411aa3e0b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class MultiTermsAggregationConverter : JsonConverter<MultiTermsAggregation>
 {
 	public override MultiTermsAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -239,69 +241,47 @@ public override void Write(Utf8JsonWriter writer, MultiTermsAggregation value, J
 public sealed partial class MultiTermsAggregation : SearchAggregation
 {
 	public MultiTermsAggregation(string name) => Name = name;
+
 	internal MultiTermsAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode? CollectMode { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public long? MinDocCount { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	[JsonConverter(typeof(AggregateOrderConverter))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? Order { get; set; }
-
 	public long? ShardMinDocCount { get; set; }
-
 	public int? ShardSize { get; set; }
-
 	public bool? ShowTermDocCountError { get; set; }
-
 	public int? Size { get; set; }
-
 	public ICollection<Elastic.Clients.Elasticsearch.Aggregations.MultiTermLookup> Terms { get; set; }
 }
 
 public sealed partial class MultiTermsAggregationDescriptor<TDocument> : SerializableDescriptor<MultiTermsAggregationDescriptor<TDocument>>
 {
 	internal MultiTermsAggregationDescriptor(Action<MultiTermsAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MultiTermsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Aggregations.MultiTermLookup> TermsValue { get; set; }
-
 	private MultiTermLookupDescriptor<TDocument> TermsDescriptor { get; set; }
-
 	private Action<MultiTermLookupDescriptor<TDocument>> TermsDescriptorAction { get; set; }
-
 	private Action<MultiTermLookupDescriptor<TDocument>>[] TermsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode? CollectModeValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private long? MinDocCountValue { get; set; }
-
 	private ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? OrderValue { get; set; }
-
 	private long? ShardMinDocCountValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
-
 	private bool? ShowTermDocCountErrorValue { get; set; }
-
 	private int? SizeValue { get; set; }
 
 	public MultiTermsAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -520,38 +500,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MultiTermsAggregationDescriptor : SerializableDescriptor<MultiTermsAggregationDescriptor>
 {
 	internal MultiTermsAggregationDescriptor(Action<MultiTermsAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public MultiTermsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Aggregations.MultiTermLookup> TermsValue { get; set; }
-
 	private MultiTermLookupDescriptor TermsDescriptor { get; set; }
-
 	private Action<MultiTermLookupDescriptor> TermsDescriptorAction { get; set; }
-
 	private Action<MultiTermLookupDescriptor>[] TermsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode? CollectModeValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private long? MinDocCountValue { get; set; }
-
 	private ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? OrderValue { get; set; }
-
 	private long? ShardMinDocCountValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
-
 	private bool? ShowTermDocCountErrorValue { get; set; }
-
 	private int? SizeValue { get; set; }
 
 	public MultiTermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsBucket.g.cs
index 63e8e722629..1061897d03a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(MultiTermsBucketConverter))]
 public sealed partial class MultiTermsBucket : AggregateDictionary
 {
@@ -34,13 +36,10 @@ public MultiTermsBucket(IReadOnlyDictionary<string, IAggregate> backingDictionar
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("doc_count_error_upper_bound")]
 	public long? DocCountErrorUpperBound { get; init; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue> Key { get; init; }
-
 	[JsonInclude, JsonPropertyName("key_as_string")]
 	public string? KeyAsString { get; init; }
 }
@@ -51,7 +50,7 @@ internal sealed class MultiTermsBucketConverter : JsonConverter<MultiTermsBucket
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		long? docCountErrorUpperBound = default;
 		IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue> key = default;
@@ -62,7 +61,7 @@ internal sealed class MultiTermsBucketConverter : JsonConverter<MultiTermsBucket
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -97,13 +96,7 @@ internal sealed class MultiTermsBucketConverter : JsonConverter<MultiTermsBucket
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new MultiTermsBucket(subAggs)
-		{
-			DocCount = docCount,
-			DocCountErrorUpperBound = docCountErrorUpperBound,
-			Key = key,
-			KeyAsString = keyAsString
-		};
+		return new MultiTermsBucket(subAggs) { DocCount = docCount, DocCountErrorUpperBound = docCountErrorUpperBound, Key = key, KeyAsString = keyAsString };
 	}
 
 	public override void Write(Utf8JsonWriter writer, MultiTermsBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregate.g.cs
index 44802ca34ec..ca19ad4468b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(NestedAggregateConverter))]
 public sealed partial class NestedAggregate : AggregateDictionary, IAggregate
 {
@@ -34,7 +36,6 @@ public NestedAggregate(IReadOnlyDictionary<string, IAggregate> backingDictionary
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
@@ -45,7 +46,7 @@ internal sealed class NestedAggregateConverter : JsonConverter<NestedAggregate>
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		IReadOnlyDictionary<string, object>? meta = default;
 		while (reader.Read())
@@ -54,7 +55,7 @@ internal sealed class NestedAggregateConverter : JsonConverter<NestedAggregate>
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -77,11 +78,7 @@ internal sealed class NestedAggregateConverter : JsonConverter<NestedAggregate>
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new NestedAggregate(subAggs)
-		{
-			DocCount = docCount,
-			Meta = meta
-		};
+		return new NestedAggregate(subAggs) { DocCount = docCount, Meta = meta };
 	}
 
 	public override void Write(Utf8JsonWriter writer, NestedAggregate value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregation.g.cs
index fb087a582e4..4240230b794 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/NestedAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class NestedAggregationConverter : JsonConverter<NestedAggregation>
 {
 	public override NestedAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -117,34 +119,29 @@ public override void Write(Utf8JsonWriter writer, NestedAggregation value, JsonS
 public sealed partial class NestedAggregation : SearchAggregation
 {
 	public NestedAggregation(string name) => Name = name;
+
 	internal NestedAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Field? Path { get; set; }
 }
 
 public sealed partial class NestedAggregationDescriptor<TDocument> : SerializableDescriptor<NestedAggregationDescriptor<TDocument>>
 {
 	internal NestedAggregationDescriptor(Action<NestedAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public NestedAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? PathValue { get; set; }
 
 	public NestedAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -230,18 +227,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class NestedAggregationDescriptor : SerializableDescriptor<NestedAggregationDescriptor>
 {
 	internal NestedAggregationDescriptor(Action<NestedAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public NestedAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? PathValue { get; set; }
 
 	public NestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregate.g.cs
index 0148f4f61ec..7c6d8574468 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(ParentAggregateConverter))]
 public sealed partial class ParentAggregate : AggregateDictionary, IAggregate
 {
@@ -34,7 +36,6 @@ public ParentAggregate(IReadOnlyDictionary<string, IAggregate> backingDictionary
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
@@ -45,7 +46,7 @@ internal sealed class ParentAggregateConverter : JsonConverter<ParentAggregate>
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		IReadOnlyDictionary<string, object>? meta = default;
 		while (reader.Read())
@@ -54,7 +55,7 @@ internal sealed class ParentAggregateConverter : JsonConverter<ParentAggregate>
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -77,11 +78,7 @@ internal sealed class ParentAggregateConverter : JsonConverter<ParentAggregate>
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new ParentAggregate(subAggs)
-		{
-			DocCount = docCount,
-			Meta = meta
-		};
+		return new ParentAggregate(subAggs) { DocCount = docCount, Meta = meta };
 	}
 
 	public override void Write(Utf8JsonWriter writer, ParentAggregate value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregation.g.cs
index 3f6ab86c7af..2eebaf5ead5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ParentAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class ParentAggregationConverter : JsonConverter<ParentAggregation>
 {
 	public override ParentAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -117,34 +119,29 @@ public override void Write(Utf8JsonWriter writer, ParentAggregation value, JsonS
 public sealed partial class ParentAggregation : SearchAggregation
 {
 	public ParentAggregation(string name) => Name = name;
+
 	internal ParentAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public string? Type { get; set; }
 }
 
 public sealed partial class ParentAggregationDescriptor<TDocument> : SerializableDescriptor<ParentAggregationDescriptor<TDocument>>
 {
 	internal ParentAggregationDescriptor(Action<ParentAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ParentAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private string? TypeValue { get; set; }
 
 	public ParentAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -224,18 +221,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ParentAggregationDescriptor : SerializableDescriptor<ParentAggregationDescriptor>
 {
 	internal ParentAggregationDescriptor(Action<ParentAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public ParentAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private string? TypeValue { get; set; }
 
 	public ParentAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Percentiles.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Percentiles.g.cs
index d1754b4c4d7..b553bf1da4d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Percentiles.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/Percentiles.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class Percentiles : Union<IReadOnlyDictionary<string, object>, IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.ArrayPercentilesItem>>
 {
 	public Percentiles(IReadOnlyDictionary<string, object> dictionary) : base(dictionary)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregate.g.cs
index 74ccc7041af..bed01ff53b2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class PercentilesBucketAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Aggregations.Percentiles Values { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregation.g.cs
index fb615ac4255..bfbe5062729 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/PercentilesBucketAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class PercentilesBucketAggregationConverter : JsonConverter<PercentilesBucketAggregation>
 {
 	public override PercentilesBucketAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -136,34 +138,29 @@ public override void Write(Utf8JsonWriter writer, PercentilesBucketAggregation v
 public sealed partial class PercentilesBucketAggregation : SearchAggregation
 {
 	public PercentilesBucketAggregation(string name) => Name = name;
+
 	internal PercentilesBucketAggregation()
 	{
 	}
 
 	public string? Format { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicy { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public ICollection<double>? Percents { get; set; }
 }
 
 public sealed partial class PercentilesBucketAggregationDescriptor : SerializableDescriptor<PercentilesBucketAggregationDescriptor>
 {
 	internal PercentilesBucketAggregationDescriptor(Action<PercentilesBucketAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public PercentilesBucketAggregationDescriptor() : base()
 	{
 	}
 
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicyValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private ICollection<double>? PercentsValue { get; set; }
 
 	public PercentilesBucketAggregationDescriptor Format(string? format)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregate.g.cs
index 645d3533cff..e9df9b37862 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class RangeAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.RangeBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregation.g.cs
index 3b88b970067..42baa9bcd22 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class RangeAggregationConverter : JsonConverter<RangeAggregation>
 {
 	public override RangeAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -189,56 +191,40 @@ public override void Write(Utf8JsonWriter writer, RangeAggregation value, JsonSe
 public sealed partial class RangeAggregation : SearchAggregation
 {
 	public RangeAggregation(string name) => Name = name;
+
 	internal RangeAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public int? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public ICollection<Elastic.Clients.Elasticsearch.Aggregations.AggregationRange>? Ranges { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class RangeAggregationDescriptor<TDocument> : SerializableDescriptor<RangeAggregationDescriptor<TDocument>>
 {
 	internal RangeAggregationDescriptor(Action<RangeAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RangeAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? MissingValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Aggregations.AggregationRange>? RangesValue { get; set; }
-
 	private AggregationRangeDescriptor RangesDescriptor { get; set; }
-
 	private Action<AggregationRangeDescriptor> RangesDescriptorAction { get; set; }
-
 	private Action<AggregationRangeDescriptor>[] RangesDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public RangeAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -427,32 +413,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RangeAggregationDescriptor : SerializableDescriptor<RangeAggregationDescriptor>
 {
 	internal RangeAggregationDescriptor(Action<RangeAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public RangeAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? MissingValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Aggregations.AggregationRange>? RangesValue { get; set; }
-
 	private AggregationRangeDescriptor RangesDescriptor { get; set; }
-
 	private Action<AggregationRangeDescriptor> RangesDescriptorAction { get; set; }
-
 	private Action<AggregationRangeDescriptor>[] RangesDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public RangeAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeBucket.g.cs
index 98e9d8e17b5..f44ad4a097d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RangeBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(RangeBucketConverter))]
 public sealed partial class RangeBucket : AggregateDictionary
 {
@@ -34,19 +36,18 @@ public RangeBucket(IReadOnlyDictionary<string, IAggregate> backingDictionary) :
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("from")]
 	public double? From { get; init; }
-
 	[JsonInclude, JsonPropertyName("from_as_string")]
 	public string? FromAsString { get; init; }
 
+	/// <summary>
+	/// <para>The bucket key. Present if the aggregation is _not_ keyed</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("key")]
 	public string? Key { get; init; }
-
 	[JsonInclude, JsonPropertyName("to")]
 	public double? To { get; init; }
-
 	[JsonInclude, JsonPropertyName("to_as_string")]
 	public string? ToAsString { get; init; }
 }
@@ -57,7 +58,7 @@ internal sealed class RangeBucketConverter : JsonConverter<RangeBucket>
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		double? from = default;
 		string? fromAsString = default;
@@ -70,7 +71,7 @@ internal sealed class RangeBucketConverter : JsonConverter<RangeBucket>
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -117,15 +118,7 @@ internal sealed class RangeBucketConverter : JsonConverter<RangeBucket>
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new RangeBucket(subAggs)
-		{
-			DocCount = docCount,
-			From = from,
-			FromAsString = fromAsString,
-			Key = key,
-			To = to,
-			ToAsString = toAsString
-		};
+		return new RangeBucket(subAggs) { DocCount = docCount, From = from, FromAsString = fromAsString, Key = key, To = to, ToAsString = toAsString };
 	}
 
 	public override void Write(Utf8JsonWriter writer, RangeBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregate.g.cs
index 980cde85a3d..4718e6f1823 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class RateAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregation.g.cs
index 1a338bc2e07..3f9ccbc6966 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/RateAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class RateAggregationConverter : JsonConverter<RateAggregation>
 {
 	public override RateAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -191,46 +193,35 @@ public sealed partial class RateAggregation : SearchAggregation
 {
 	public RateAggregation(string name, Field field) : this(name) => Field = field;
 	public RateAggregation(string name) => Name = name;
+
 	internal RateAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.RateMode? Mode { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.CalendarInterval? Unit { get; set; }
 }
 
 public sealed partial class RateAggregationDescriptor<TDocument> : SerializableDescriptor<RateAggregationDescriptor<TDocument>>
 {
 	internal RateAggregationDescriptor(Action<RateAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RateAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.RateMode? ModeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.CalendarInterval? UnitValue { get; set; }
 
 	public RateAggregationDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -336,22 +327,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RateAggregationDescriptor : SerializableDescriptor<RateAggregationDescriptor>
 {
 	internal RateAggregationDescriptor(Action<RateAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public RateAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.RateMode? ModeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.CalendarInterval? UnitValue { get; set; }
 
 	public RateAggregationDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregate.g.cs
index 18a8c83e0f0..7429bc49036 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(ReverseNestedAggregateConverter))]
 public sealed partial class ReverseNestedAggregate : AggregateDictionary, IAggregate
 {
@@ -34,7 +36,6 @@ public ReverseNestedAggregate(IReadOnlyDictionary<string, IAggregate> backingDic
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
@@ -45,7 +46,7 @@ internal sealed class ReverseNestedAggregateConverter : JsonConverter<ReverseNes
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		IReadOnlyDictionary<string, object>? meta = default;
 		while (reader.Read())
@@ -54,7 +55,7 @@ internal sealed class ReverseNestedAggregateConverter : JsonConverter<ReverseNes
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -77,11 +78,7 @@ internal sealed class ReverseNestedAggregateConverter : JsonConverter<ReverseNes
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new ReverseNestedAggregate(subAggs)
-		{
-			DocCount = docCount,
-			Meta = meta
-		};
+		return new ReverseNestedAggregate(subAggs) { DocCount = docCount, Meta = meta };
 	}
 
 	public override void Write(Utf8JsonWriter writer, ReverseNestedAggregate value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregation.g.cs
index 5223a7df5f2..8e6658281b7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ReverseNestedAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class ReverseNestedAggregationConverter : JsonConverter<ReverseNestedAggregation>
 {
 	public override ReverseNestedAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -117,34 +119,29 @@ public override void Write(Utf8JsonWriter writer, ReverseNestedAggregation value
 public sealed partial class ReverseNestedAggregation : SearchAggregation
 {
 	public ReverseNestedAggregation(string name) => Name = name;
+
 	internal ReverseNestedAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Field? Path { get; set; }
 }
 
 public sealed partial class ReverseNestedAggregationDescriptor<TDocument> : SerializableDescriptor<ReverseNestedAggregationDescriptor<TDocument>>
 {
 	internal ReverseNestedAggregationDescriptor(Action<ReverseNestedAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ReverseNestedAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? PathValue { get; set; }
 
 	public ReverseNestedAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -230,18 +227,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ReverseNestedAggregationDescriptor : SerializableDescriptor<ReverseNestedAggregationDescriptor>
 {
 	internal ReverseNestedAggregationDescriptor(Action<ReverseNestedAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public ReverseNestedAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? PathValue { get; set; }
 
 	public ReverseNestedAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregate.g.cs
index 1a790af08a2..853357d472a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(SamplerAggregateConverter))]
 public sealed partial class SamplerAggregate : AggregateDictionary, IAggregate
 {
@@ -34,7 +36,6 @@ public SamplerAggregate(IReadOnlyDictionary<string, IAggregate> backingDictionar
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
@@ -45,7 +46,7 @@ internal sealed class SamplerAggregateConverter : JsonConverter<SamplerAggregate
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		IReadOnlyDictionary<string, object>? meta = default;
 		while (reader.Read())
@@ -54,7 +55,7 @@ internal sealed class SamplerAggregateConverter : JsonConverter<SamplerAggregate
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -77,11 +78,7 @@ internal sealed class SamplerAggregateConverter : JsonConverter<SamplerAggregate
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new SamplerAggregate(subAggs)
-		{
-			DocCount = docCount,
-			Meta = meta
-		};
+		return new SamplerAggregate(subAggs) { DocCount = docCount, Meta = meta };
 	}
 
 	public override void Write(Utf8JsonWriter writer, SamplerAggregate value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregation.g.cs
index 7551b19c2cd..3cec867365a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SamplerAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class SamplerAggregationConverter : JsonConverter<SamplerAggregation>
 {
 	public override SamplerAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -117,34 +119,29 @@ public override void Write(Utf8JsonWriter writer, SamplerAggregation value, Json
 public sealed partial class SamplerAggregation : SearchAggregation
 {
 	public SamplerAggregation(string name) => Name = name;
+
 	internal SamplerAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public int? ShardSize { get; set; }
 }
 
 public sealed partial class SamplerAggregationDescriptor<TDocument> : SerializableDescriptor<SamplerAggregationDescriptor<TDocument>>
 {
 	internal SamplerAggregationDescriptor(Action<SamplerAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SamplerAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
 
 	public SamplerAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -224,18 +221,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SamplerAggregationDescriptor : SerializableDescriptor<SamplerAggregationDescriptor>
 {
 	internal SamplerAggregationDescriptor(Action<SamplerAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public SamplerAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
 
 	public SamplerAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregate.g.cs
index ec06ce09659..64ca2bf26ce 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class ScriptedMetricAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public object Value { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregation.g.cs
index 25f1613667a..e1159504a0d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ScriptedMetricAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class ScriptedMetricAggregationConverter : JsonConverter<ScriptedMetricAggregation>
 {
 	public override ScriptedMetricAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -227,54 +229,39 @@ public sealed partial class ScriptedMetricAggregation : SearchAggregation
 {
 	public ScriptedMetricAggregation(string name, Field field) : this(name) => Field = field;
 	public ScriptedMetricAggregation(string name) => Name = name;
+
 	internal ScriptedMetricAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Script? CombineScript { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Script? InitScript { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Script? MapScript { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public IDictionary<string, object>? Params { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Script? ReduceScript { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class ScriptedMetricAggregationDescriptor<TDocument> : SerializableDescriptor<ScriptedMetricAggregationDescriptor<TDocument>>
 {
 	internal ScriptedMetricAggregationDescriptor(Action<ScriptedMetricAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ScriptedMetricAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Script? CombineScriptValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? InitScriptValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? MapScriptValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ReduceScriptValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public ScriptedMetricAggregationDescriptor<TDocument> CombineScript(Elastic.Clients.Elasticsearch.Script? combineScript)
@@ -404,26 +391,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ScriptedMetricAggregationDescriptor : SerializableDescriptor<ScriptedMetricAggregationDescriptor>
 {
 	internal ScriptedMetricAggregationDescriptor(Action<ScriptedMetricAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public ScriptedMetricAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Script? CombineScriptValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? InitScriptValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? MapScriptValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ReduceScriptValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public ScriptedMetricAggregationDescriptor CombineScript(Elastic.Clients.Elasticsearch.Script? combineScript)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SimpleValueAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SimpleValueAggregate.g.cs
index cb937485b0d..98fc7cd5cca 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SimpleValueAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SimpleValueAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class SimpleValueAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StandardDeviationBounds.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StandardDeviationBounds.g.cs
index ab032e0ec86..a1b67ca3ba7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StandardDeviationBounds.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StandardDeviationBounds.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class StandardDeviationBounds
 {
 	[JsonInclude, JsonPropertyName("lower")]
 	public double? Lower { get; init; }
-
 	[JsonInclude, JsonPropertyName("lower_population")]
 	public double? LowerPopulation { get; init; }
-
 	[JsonInclude, JsonPropertyName("lower_sampling")]
 	public double? LowerSampling { get; init; }
-
 	[JsonInclude, JsonPropertyName("upper")]
 	public double? Upper { get; init; }
-
 	[JsonInclude, JsonPropertyName("upper_population")]
 	public double? UpperPopulation { get; init; }
-
 	[JsonInclude, JsonPropertyName("upper_sampling")]
 	public double? UpperSampling { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StandardDeviationBoundsAsString.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StandardDeviationBoundsAsString.g.cs
index 2539d9e4202..333a651bd7d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StandardDeviationBoundsAsString.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StandardDeviationBoundsAsString.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class StandardDeviationBoundsAsString
 {
 	[JsonInclude, JsonPropertyName("lower")]
 	public string Lower { get; init; }
-
 	[JsonInclude, JsonPropertyName("lower_population")]
 	public string LowerPopulation { get; init; }
-
 	[JsonInclude, JsonPropertyName("lower_sampling")]
 	public string LowerSampling { get; init; }
-
 	[JsonInclude, JsonPropertyName("upper")]
 	public string Upper { get; init; }
-
 	[JsonInclude, JsonPropertyName("upper_population")]
 	public string UpperPopulation { get; init; }
-
 	[JsonInclude, JsonPropertyName("upper_sampling")]
 	public string UpperSampling { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregate.g.cs
index a6f5779ca47..641097ff092 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,31 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
+/// <summary>
+/// <para>Statistics aggregation result. `min`, `max` and `avg` are missing if there were no values to process<br/>(`count` is zero).</para>
+/// </summary>
 public sealed partial class StatsAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("avg")]
 	public double? Avg { get; init; }
-
 	[JsonInclude, JsonPropertyName("avg_as_string")]
 	public string? AvgAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-
 	[JsonInclude, JsonPropertyName("max")]
 	public double? Max { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_as_string")]
 	public string? MaxAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("min")]
 	public double? Min { get; init; }
-
 	[JsonInclude, JsonPropertyName("min_as_string")]
 	public string? MinAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum")]
 	public double Sum { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_as_string")]
 	public string? SumAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregation.g.cs
index 1f1bf376494..3cc29b1279e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class StatsAggregationConverter : JsonConverter<StatsAggregation>
 {
 	public override StatsAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -155,38 +157,31 @@ public sealed partial class StatsAggregation : SearchAggregation
 {
 	public StatsAggregation(string name, Field field) : this(name) => Field = field;
 	public StatsAggregation(string name) => Name = name;
+
 	internal StatsAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class StatsAggregationDescriptor<TDocument> : SerializableDescriptor<StatsAggregationDescriptor<TDocument>>
 {
 	internal StatsAggregationDescriptor(Action<StatsAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public StatsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public StatsAggregationDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -268,18 +263,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class StatsAggregationDescriptor : SerializableDescriptor<StatsAggregationDescriptor>
 {
 	internal StatsAggregationDescriptor(Action<StatsAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public StatsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public StatsAggregationDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregate.g.cs
index ac4a1dea61a..ec9d642824d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class StatsBucketAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("avg")]
 	public double? Avg { get; init; }
-
 	[JsonInclude, JsonPropertyName("avg_as_string")]
 	public string? AvgAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-
 	[JsonInclude, JsonPropertyName("max")]
 	public double? Max { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_as_string")]
 	public string? MaxAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("min")]
 	public double? Min { get; init; }
-
 	[JsonInclude, JsonPropertyName("min_as_string")]
 	public string? MinAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum")]
 	public double Sum { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_as_string")]
 	public string? SumAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregation.g.cs
index 963f20cd951..70c71949dd5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StatsBucketAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class StatsBucketAggregationConverter : JsonConverter<StatsBucketAggregation>
 {
 	public override StatsBucketAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -118,30 +120,27 @@ public override void Write(Utf8JsonWriter writer, StatsBucketAggregation value,
 public sealed partial class StatsBucketAggregation : SearchAggregation
 {
 	public StatsBucketAggregation(string name) => Name = name;
+
 	internal StatsBucketAggregation()
 	{
 	}
 
 	public string? Format { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicy { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
+	override public string? Name { get; internal set; }
 }
 
 public sealed partial class StatsBucketAggregationDescriptor : SerializableDescriptor<StatsBucketAggregationDescriptor>
 {
 	internal StatsBucketAggregationDescriptor(Action<StatsBucketAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public StatsBucketAggregationDescriptor() : base()
 	{
 	}
 
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.GapPolicy? GapPolicyValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
 
 	public StatsBucketAggregationDescriptor Format(string? format)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregate.g.cs
index 07d20c3204c..2bcd1cd10f5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class StringStatsAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("avg_length")]
 	public double? AvgLength { get; init; }
-
 	[JsonInclude, JsonPropertyName("avg_length_as_string")]
 	public string? AvgLengthAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-
 	[JsonInclude, JsonPropertyName("distribution")]
 	public IReadOnlyDictionary<string, double>? Distribution { get; init; }
-
 	[JsonInclude, JsonPropertyName("entropy")]
 	public double? Entropy { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_length")]
 	public int? MaxLength { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_length_as_string")]
 	public string? MaxLengthAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("min_length")]
 	public int? MinLength { get; init; }
-
 	[JsonInclude, JsonPropertyName("min_length_as_string")]
 	public string? MinLengthAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregation.g.cs
index 5de64f4435d..70bb44b747b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringStatsAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class StringStatsAggregationConverter : JsonConverter<StringStatsAggregation>
 {
 	public override StringStatsAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -155,38 +157,31 @@ public sealed partial class StringStatsAggregation : SearchAggregation
 {
 	public StringStatsAggregation(string name, Field field) : this(name) => Field = field;
 	public StringStatsAggregation(string name) => Name = name;
+
 	internal StringStatsAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	public bool? ShowDistribution { get; set; }
 }
 
 public sealed partial class StringStatsAggregationDescriptor<TDocument> : SerializableDescriptor<StringStatsAggregationDescriptor<TDocument>>
 {
 	internal StringStatsAggregationDescriptor(Action<StringStatsAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public StringStatsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private bool? ShowDistributionValue { get; set; }
 
 	public StringStatsAggregationDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -268,18 +263,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class StringStatsAggregationDescriptor : SerializableDescriptor<StringStatsAggregationDescriptor>
 {
 	internal StringStatsAggregationDescriptor(Action<StringStatsAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public StringStatsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private bool? ShowDistributionValue { get; set; }
 
 	public StringStatsAggregationDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsAggregate.g.cs
index 48d9b04a35f..c62df21b75a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
+/// <summary>
+/// <para>Result of a `terms` aggregation when the field is a string.</para>
+/// </summary>
 public sealed partial class StringTermsAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.StringTermsBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("doc_count_error_upper_bound")]
 	public long? DocCountErrorUpperBound { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("sum_other_doc_count")]
 	public long? SumOtherDocCount { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsBucket.g.cs
index 07a1996ee29..4981b5508dd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/StringTermsBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(StringTermsBucketConverter))]
 public sealed partial class StringTermsBucket : AggregateDictionary
 {
@@ -34,10 +36,8 @@ public StringTermsBucket(IReadOnlyDictionary<string, IAggregate> backingDictiona
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("doc_count_error")]
 	public long? DocCountError { get; init; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public Elastic.Clients.Elasticsearch.FieldValue Key { get; init; }
 }
@@ -48,7 +48,7 @@ internal sealed class StringTermsBucketConverter : JsonConverter<StringTermsBuck
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		long? docCountError = default;
 		Elastic.Clients.Elasticsearch.FieldValue key = default;
@@ -58,7 +58,7 @@ internal sealed class StringTermsBucketConverter : JsonConverter<StringTermsBuck
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -87,12 +87,7 @@ internal sealed class StringTermsBucketConverter : JsonConverter<StringTermsBuck
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new StringTermsBucket(subAggs)
-		{
-			DocCount = docCount,
-			DocCountError = docCountError,
-			Key = key
-		};
+		return new StringTermsBucket(subAggs) { DocCount = docCount, DocCountError = docCountError, Key = key };
 	}
 
 	public override void Write(Utf8JsonWriter writer, StringTermsBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregate.g.cs
index 1e044b55cfb..2837796f7c0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,17 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
+/// <summary>
+/// <para>Sum aggregation result. `value` is always present and is zero if there were no values to process.</para>
+/// </summary>
 public sealed partial class SumAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregation.g.cs
index 55a5bfe1987..a0bc9eeba70 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/SumAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class SumAggregationConverter : JsonConverter<SumAggregation>
 {
 	public override SumAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -155,38 +157,31 @@ public sealed partial class SumAggregation : SearchAggregation
 {
 	public SumAggregation(string name, Field field) : this(name) => Field = field;
 	public SumAggregation(string name) => Name = name;
+
 	internal SumAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class SumAggregationDescriptor<TDocument> : SerializableDescriptor<SumAggregationDescriptor<TDocument>>
 {
 	internal SumAggregationDescriptor(Action<SumAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SumAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public SumAggregationDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -268,18 +263,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SumAggregationDescriptor : SerializableDescriptor<SumAggregationDescriptor>
 {
 	internal SumAggregationDescriptor(Action<SumAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public SumAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public SumAggregationDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TDigestPercentileRanksAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TDigestPercentileRanksAggregate.g.cs
index 56fa189c97f..b38f73b6d5a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TDigestPercentileRanksAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TDigestPercentileRanksAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class TDigestPercentileRanksAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Aggregations.Percentiles Values { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregate.g.cs
index 41435ce8a67..a152f0c5218 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class TTestAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregation.g.cs
index 7b2aa240248..92d25160178 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TTestAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class TTestAggregationConverter : JsonConverter<TTestAggregation>
 {
 	public override TTestAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -136,42 +138,33 @@ public override void Write(Utf8JsonWriter writer, TTestAggregation value, JsonSe
 public sealed partial class TTestAggregation : SearchAggregation
 {
 	public TTestAggregation(string name) => Name = name;
+
 	internal TTestAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.TestPopulation? a { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.TestPopulation? b { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Aggregations.TTestType? Type { get; set; }
 }
 
 public sealed partial class TTestAggregationDescriptor<TDocument> : SerializableDescriptor<TTestAggregationDescriptor<TDocument>>
 {
 	internal TTestAggregationDescriptor(Action<TTestAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TTestAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.TestPopulation? aValue { get; set; }
-
 	private TestPopulationDescriptor<TDocument> aDescriptor { get; set; }
-
 	private Action<TestPopulationDescriptor<TDocument>> aDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TestPopulation? bValue { get; set; }
-
 	private TestPopulationDescriptor<TDocument> bDescriptor { get; set; }
-
 	private Action<TestPopulationDescriptor<TDocument>> bDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TTestType? TypeValue { get; set; }
 
 	public TTestAggregationDescriptor<TDocument> a(Elastic.Clients.Elasticsearch.Aggregations.TestPopulation? a)
@@ -291,24 +284,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TTestAggregationDescriptor : SerializableDescriptor<TTestAggregationDescriptor>
 {
 	internal TTestAggregationDescriptor(Action<TTestAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public TTestAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.TestPopulation? aValue { get; set; }
-
 	private TestPopulationDescriptor aDescriptor { get; set; }
-
 	private Action<TestPopulationDescriptor> aDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TestPopulation? bValue { get; set; }
-
 	private TestPopulationDescriptor bDescriptor { get; set; }
-
 	private Action<TestPopulationDescriptor> bDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TTestType? TypeValue { get; set; }
 
 	public TTestAggregationDescriptor a(Elastic.Clients.Elasticsearch.Aggregations.TestPopulation? a)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs
index f3f747620d7..c043db1927e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class TermsAggregationConverter : JsonConverter<TermsAggregation>
 {
 	public override TermsAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -387,95 +389,60 @@ public override void Write(Utf8JsonWriter writer, TermsAggregation value, JsonSe
 public sealed partial class TermsAggregation : SearchAggregation
 {
 	public TermsAggregation(string name) => Name = name;
+
 	internal TermsAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? Aggregations { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode? CollectMode { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsExclude? Exclude { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationExecutionHint? ExecutionHint { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.TermsInclude? Include { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public int? MinDocCount { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
 	public bool? MissingBucket { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.MissingOrder? MissingOrder { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	[JsonConverter(typeof(AggregateOrderConverter))]
 	public ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? Order { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	public int? ShardSize { get; set; }
-
 	public bool? ShowTermDocCountError { get; set; }
-
 	public int? Size { get; set; }
-
 	public string? ValueType { get; set; }
 }
 
 public sealed partial class TermsAggregationDescriptor<TDocument> : SerializableDescriptor<TermsAggregationDescriptor<TDocument>>
 {
 	internal TermsAggregationDescriptor(Action<TermsAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TermsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument> AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor<TDocument>> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode? CollectModeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsExclude? ExcludeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationExecutionHint? ExecutionHintValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsInclude? IncludeValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? MinDocCountValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private bool? MissingBucketValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.MissingOrder? MissingOrderValue { get; set; }
-
 	private ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? OrderValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
-
 	private bool? ShowTermDocCountErrorValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private string? ValueTypeValue { get; set; }
 
 	public TermsAggregationDescriptor<TDocument> Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
@@ -741,48 +708,30 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TermsAggregationDescriptor : SerializableDescriptor<TermsAggregationDescriptor>
 {
 	internal TermsAggregationDescriptor(Action<TermsAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public TermsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? AggregationsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor AggregationsDescriptor { get; set; }
-
 	private Action<Elastic.Clients.Elasticsearch.Aggregations.AggregationDescriptor> AggregationsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationCollectMode? CollectModeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsExclude? ExcludeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsAggregationExecutionHint? ExecutionHintValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.TermsInclude? IncludeValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? MinDocCountValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private bool? MissingBucketValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.MissingOrder? MissingOrderValue { get; set; }
-
 	private ICollection<KeyValuePair<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.SortOrder>>? OrderValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
-
 	private bool? ShowTermDocCountErrorValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private string? ValueTypeValue { get; set; }
 
 	public TermsAggregationDescriptor Aggregations(Elastic.Clients.Elasticsearch.Aggregations.AggregationDictionary? aggregations)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsPartition.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsPartition.g.cs
index 3187c39b9dc..67c351dab32 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsPartition.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsPartition.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class TermsPartition
 {
 	[JsonInclude, JsonPropertyName("num_partitions")]
 	public long NumPartitions { get; set; }
-
 	[JsonInclude, JsonPropertyName("partition")]
 	public long Partition { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class TermsPartition
 public sealed partial class TermsPartitionDescriptor : SerializableDescriptor<TermsPartitionDescriptor>
 {
 	internal TermsPartitionDescriptor(Action<TermsPartitionDescriptor> configure) => configure.Invoke(this);
+
 	public TermsPartitionDescriptor() : base()
 	{
 	}
 
 	private long NumPartitionsValue { get; set; }
-
 	private long PartitionValue { get; set; }
 
 	public TermsPartitionDescriptor NumPartitions(long numPartitions)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TestPopulation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TestPopulation.g.cs
index 4bacf3ef519..4c7976e83c7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TestPopulation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TestPopulation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class TestPopulation
 {
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
@@ -40,18 +40,15 @@ public sealed partial class TestPopulation
 public sealed partial class TestPopulationDescriptor<TDocument> : SerializableDescriptor<TestPopulationDescriptor<TDocument>>
 {
 	internal TestPopulationDescriptor(Action<TestPopulationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TestPopulationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public TestPopulationDescriptor<TDocument> Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
@@ -130,18 +127,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TestPopulationDescriptor : SerializableDescriptor<TestPopulationDescriptor>
 {
 	internal TestPopulationDescriptor(Action<TestPopulationDescriptor> configure) => configure.Invoke(this);
+
 	public TestPopulationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public TestPopulationDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregate.g.cs
index 77b42f6025e..5a7011780ff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class TopHitsAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<object> Hits { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs
index 1c7d0cb8cdf..45c01e6d5e9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class TopHitsAggregationConverter : JsonConverter<TopHitsAggregation>
 {
 	public override TopHitsAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -353,92 +355,58 @@ public sealed partial class TopHitsAggregation : SearchAggregation
 {
 	public TopHitsAggregation(string name, Field field) : this(name) => Field = field;
 	public TopHitsAggregation(string name) => Name = name;
+
 	internal TopHitsAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Fields? DocvalueFields { get; set; }
-
 	public bool? Explain { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public int? From { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Core.Search.Highlight? Highlight { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	public IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFields { get; set; }
-
 	public bool? SeqNoPrimaryTerm { get; set; }
-
 	public int? Size { get; set; }
-
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get; set; }
-
 	public bool? TrackScores { get; set; }
-
 	public bool? Version { get; set; }
 }
 
 public sealed partial class TopHitsAggregationDescriptor<TDocument> : SerializableDescriptor<TopHitsAggregationDescriptor<TDocument>>
 {
 	internal TopHitsAggregationDescriptor(Action<TopHitsAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TopHitsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.Highlight? HighlightValue { get; set; }
-
 	private Core.Search.HighlightDescriptor<TDocument> HighlightDescriptor { get; set; }
-
 	private Action<Core.Search.HighlightDescriptor<TDocument>> HighlightDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor<TDocument> SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? DocvalueFieldsValue { get; set; }
-
 	private bool? ExplainValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFieldsValue { get; set; }
-
 	private bool? SeqNoPrimaryTermValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; }
-
 	private bool? TrackScoresValue { get; set; }
-
 	private bool? VersionValue { get; set; }
 
 	public TopHitsAggregationDescriptor<TDocument> Highlight(Elastic.Clients.Elasticsearch.Core.Search.Highlight? highlight)
@@ -733,50 +701,31 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TopHitsAggregationDescriptor : SerializableDescriptor<TopHitsAggregationDescriptor>
 {
 	internal TopHitsAggregationDescriptor(Action<TopHitsAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public TopHitsAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.Highlight? HighlightValue { get; set; }
-
 	private Core.Search.HighlightDescriptor HighlightDescriptor { get; set; }
-
 	private Action<Core.Search.HighlightDescriptor> HighlightDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? DocvalueFieldsValue { get; set; }
-
 	private bool? ExplainValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFieldsValue { get; set; }
-
 	private bool? SeqNoPrimaryTermValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; }
-
 	private bool? TrackScoresValue { get; set; }
-
 	private bool? VersionValue { get; set; }
 
 	public TopHitsAggregationDescriptor Highlight(Elastic.Clients.Elasticsearch.Core.Search.Highlight? highlight)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetrics.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetrics.g.cs
index ab244b3e671..11d3ef5a033 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetrics.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetrics.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class TopMetrics
 {
 	[JsonInclude, JsonPropertyName("metrics")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.FieldValue>? Metrics { get; init; }
-
 	[JsonInclude, JsonPropertyName("sort")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>? Sort { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregate.g.cs
index aa0e5914de8..3675a8b9148 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class TopMetricsAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("top")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.TopMetrics> Top { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs
index 197122db282..834d28f8c1b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class TopMetricsAggregationConverter : JsonConverter<TopMetricsAggregation>
 {
 	public override TopMetricsAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -191,58 +193,41 @@ public sealed partial class TopMetricsAggregation : SearchAggregation
 {
 	public TopMetricsAggregation(string name, Field field) : this(name) => Field = field;
 	public TopMetricsAggregation(string name) => Name = name;
+
 	internal TopMetricsAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public ICollection<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue>? Metrics { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	public int? Size { get; set; }
-
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 }
 
 public sealed partial class TopMetricsAggregationDescriptor<TDocument> : SerializableDescriptor<TopMetricsAggregationDescriptor<TDocument>>
 {
 	internal TopMetricsAggregationDescriptor(Action<TopMetricsAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TopMetricsAggregationDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue>? MetricsValue { get; set; }
-
 	private TopMetricsValueDescriptor<TDocument> MetricsDescriptor { get; set; }
-
 	private Action<TopMetricsValueDescriptor<TDocument>> MetricsDescriptorAction { get; set; }
-
 	private Action<TopMetricsValueDescriptor<TDocument>>[] MetricsDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor<TDocument> SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private int? SizeValue { get; set; }
 
 	public TopMetricsAggregationDescriptor<TDocument> Metrics(ICollection<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue>? metrics)
@@ -454,34 +439,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TopMetricsAggregationDescriptor : SerializableDescriptor<TopMetricsAggregationDescriptor>
 {
 	internal TopMetricsAggregationDescriptor(Action<TopMetricsAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public TopMetricsAggregationDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue>? MetricsValue { get; set; }
-
 	private TopMetricsValueDescriptor MetricsDescriptor { get; set; }
-
 	private Action<TopMetricsValueDescriptor> MetricsDescriptorAction { get; set; }
-
 	private Action<TopMetricsValueDescriptor>[] MetricsDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private int? SizeValue { get; set; }
 
 	public TopMetricsAggregationDescriptor Metrics(ICollection<Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValue>? metrics)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsValue.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsValue.g.cs
index 8937759c72b..56f7ce58cca 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsValue.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsValue.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class TopMetricsValue
 {
 	[JsonInclude, JsonPropertyName("field")]
@@ -34,6 +36,7 @@ public sealed partial class TopMetricsValue
 public sealed partial class TopMetricsValueDescriptor<TDocument> : SerializableDescriptor<TopMetricsValueDescriptor<TDocument>>
 {
 	internal TopMetricsValueDescriptor(Action<TopMetricsValueDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TopMetricsValueDescriptor() : base()
 	{
 	}
@@ -64,6 +67,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TopMetricsValueDescriptor : SerializableDescriptor<TopMetricsValueDescriptor>
 {
 	internal TopMetricsValueDescriptor(Action<TopMetricsValueDescriptor> configure) => configure.Invoke(this);
+
 	public TopMetricsValueDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregate.g.cs
index ea1e91a8846..111bc0d9ec7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,17 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
+/// <summary>
+/// <para>Value count aggregation result. `value` is always present.</para>
+/// </summary>
 public sealed partial class ValueCountAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregation.g.cs
index 3eeef7e024e..f46c4e19dd8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/ValueCountAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class ValueCountAggregationConverter : JsonConverter<ValueCountAggregation>
 {
 	public override ValueCountAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -155,38 +157,31 @@ public sealed partial class ValueCountAggregation : SearchAggregation
 {
 	public ValueCountAggregation(string name, Field field) : this(name) => Field = field;
 	public ValueCountAggregation(string name) => Name = name;
+
 	internal ValueCountAggregation()
 	{
 	}
 
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
 	public FieldValue? Missing { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
 
 public sealed partial class ValueCountAggregationDescriptor<TDocument> : SerializableDescriptor<ValueCountAggregationDescriptor<TDocument>>
 {
 	internal ValueCountAggregationDescriptor(Action<ValueCountAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ValueCountAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public ValueCountAggregationDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -268,18 +263,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ValueCountAggregationDescriptor : SerializableDescriptor<ValueCountAggregationDescriptor>
 {
 	internal ValueCountAggregationDescriptor(Action<ValueCountAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public ValueCountAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public ValueCountAggregationDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregate.g.cs
index f3ca59000da..5501a87a5b2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class VariableWidthHistogramAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("buckets")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Aggregations.VariableWidthHistogramBucket> Buckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregation.g.cs
index 93224c4e6d4..c32e86f595e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class VariableWidthHistogramAggregationConverter : JsonConverter<VariableWidthHistogramAggregation>
 {
 	public override VariableWidthHistogramAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -154,38 +156,31 @@ public override void Write(Utf8JsonWriter writer, VariableWidthHistogramAggregat
 public sealed partial class VariableWidthHistogramAggregation : SearchAggregation
 {
 	public VariableWidthHistogramAggregation(string name) => Name = name;
+
 	internal VariableWidthHistogramAggregation()
 	{
 	}
 
 	public int? Buckets { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	public int? InitialBuffer { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public int? ShardSize { get; set; }
 }
 
 public sealed partial class VariableWidthHistogramAggregationDescriptor<TDocument> : SerializableDescriptor<VariableWidthHistogramAggregationDescriptor<TDocument>>
 {
 	internal VariableWidthHistogramAggregationDescriptor(Action<VariableWidthHistogramAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public VariableWidthHistogramAggregationDescriptor() : base()
 	{
 	}
 
 	private int? BucketsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private int? InitialBufferValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
 
 	public VariableWidthHistogramAggregationDescriptor<TDocument> Buckets(int? buckets)
@@ -267,18 +262,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class VariableWidthHistogramAggregationDescriptor : SerializableDescriptor<VariableWidthHistogramAggregationDescriptor>
 {
 	internal VariableWidthHistogramAggregationDescriptor(Action<VariableWidthHistogramAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public VariableWidthHistogramAggregationDescriptor() : base()
 	{
 	}
 
 	private int? BucketsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private int? InitialBufferValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
 
 	public VariableWidthHistogramAggregationDescriptor Buckets(int? buckets)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramBucket.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramBucket.g.cs
index 3375234172b..4f314456580 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramBucket.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/VariableWidthHistogramBucket.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(VariableWidthHistogramBucketConverter))]
 public sealed partial class VariableWidthHistogramBucket : AggregateDictionary
 {
@@ -34,22 +36,16 @@ public VariableWidthHistogramBucket(IReadOnlyDictionary<string, IAggregate> back
 
 	[JsonInclude, JsonPropertyName("doc_count")]
 	public long DocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("key")]
 	public double Key { get; init; }
-
 	[JsonInclude, JsonPropertyName("key_as_string")]
 	public string? KeyAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("max")]
 	public double Max { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_as_string")]
 	public string? MaxAsString { get; init; }
-
 	[JsonInclude, JsonPropertyName("min")]
 	public double Min { get; init; }
-
 	[JsonInclude, JsonPropertyName("min_as_string")]
 	public string? MinAsString { get; init; }
 }
@@ -60,7 +56,7 @@ internal sealed class VariableWidthHistogramBucketConverter : JsonConverter<Vari
 	{
 		if (reader.TokenType != JsonTokenType.StartObject)
 			throw new JsonException($"Expected {JsonTokenType.StartObject} but read {reader.TokenType}.");
-		var subAggs = new Dictionary<string, IAggregate>(); // TODO - Optimise this and only create if we need it.
+		var subAggs = new Dictionary<string, IAggregate>();// TODO - Optimise this and only create if we need it.
 		long docCount = default;
 		double key = default;
 		string? keyAsString = default;
@@ -74,7 +70,7 @@ internal sealed class VariableWidthHistogramBucketConverter : JsonConverter<Vari
 				break;
 			if (reader.TokenType != JsonTokenType.PropertyName)
 				throw new JsonException($"Expected {JsonTokenType.PropertyName} but read {reader.TokenType}.");
-			var name = reader.GetString(); // TODO: Future optimisation, get raw bytes span and parse based on those
+			var name = reader.GetString();// TODO: Future optimisation, get raw bytes span and parse based on those
 			reader.Read();
 			if (name.Equals("doc_count", StringComparison.Ordinal))
 			{
@@ -127,16 +123,7 @@ internal sealed class VariableWidthHistogramBucketConverter : JsonConverter<Vari
 			throw new JsonException("Unknown property read from JSON.");
 		}
 
-		return new VariableWidthHistogramBucket(subAggs)
-		{
-			DocCount = docCount,
-			Key = key,
-			KeyAsString = keyAsString,
-			Max = max,
-			MaxAsString = maxAsString,
-			Min = min,
-			MinAsString = minAsString
-		};
+		return new VariableWidthHistogramBucket(subAggs) { DocCount = docCount, Key = key, KeyAsString = keyAsString, Max = max, MaxAsString = maxAsString, Min = min, MinAsString = minAsString };
 	}
 
 	public override void Write(Utf8JsonWriter writer, VariableWidthHistogramBucket value, JsonSerializerOptions options) => throw new NotImplementedException();
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregation.g.cs
index 721ef286c46..443c3225eb6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageAggregation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 internal sealed class WeightedAverageAggregationConverter : JsonConverter<WeightedAverageAggregation>
 {
 	public override WeightedAverageAggregation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -154,46 +156,35 @@ public override void Write(Utf8JsonWriter writer, WeightedAverageAggregation val
 public sealed partial class WeightedAverageAggregation : SearchAggregation
 {
 	public WeightedAverageAggregation(string name) => Name = name;
+
 	internal WeightedAverageAggregation()
 	{
 	}
 
 	public string? Format { get; set; }
-
 	public IDictionary<string, object>? Meta { get; set; }
-
-	public override string? Name { get; internal set; }
-
+	override public string? Name { get; internal set; }
 	public Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageValue? Value { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.ValueType? ValueType { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageValue? Weight { get; set; }
 }
 
 public sealed partial class WeightedAverageAggregationDescriptor<TDocument> : SerializableDescriptor<WeightedAverageAggregationDescriptor<TDocument>>
 {
 	internal WeightedAverageAggregationDescriptor(Action<WeightedAverageAggregationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public WeightedAverageAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageValue? ValueValue { get; set; }
-
 	private WeightedAverageValueDescriptor<TDocument> ValueDescriptor { get; set; }
-
 	private Action<WeightedAverageValueDescriptor<TDocument>> ValueDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageValue? WeightValue { get; set; }
-
 	private WeightedAverageValueDescriptor<TDocument> WeightDescriptor { get; set; }
-
 	private Action<WeightedAverageValueDescriptor<TDocument>> WeightDescriptorAction { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.ValueType? ValueTypeValue { get; set; }
 
 	public WeightedAverageAggregationDescriptor<TDocument> Value(Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageValue? value)
@@ -325,26 +316,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class WeightedAverageAggregationDescriptor : SerializableDescriptor<WeightedAverageAggregationDescriptor>
 {
 	internal WeightedAverageAggregationDescriptor(Action<WeightedAverageAggregationDescriptor> configure) => configure.Invoke(this);
+
 	public WeightedAverageAggregationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageValue? ValueValue { get; set; }
-
 	private WeightedAverageValueDescriptor ValueDescriptor { get; set; }
-
 	private Action<WeightedAverageValueDescriptor> ValueDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageValue? WeightValue { get; set; }
-
 	private WeightedAverageValueDescriptor WeightDescriptor { get; set; }
-
 	private Action<WeightedAverageValueDescriptor> WeightDescriptorAction { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Aggregations.ValueType? ValueTypeValue { get; set; }
 
 	public WeightedAverageAggregationDescriptor Value(Elastic.Clients.Elasticsearch.Aggregations.WeightedAverageValue? value)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageValue.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageValue.g.cs
index 4c6cc611795..c05bcc96c7e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageValue.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAverageValue.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 public sealed partial class WeightedAverageValue
 {
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("missing")]
 	public double? Missing { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class WeightedAverageValue
 public sealed partial class WeightedAverageValueDescriptor<TDocument> : SerializableDescriptor<WeightedAverageValueDescriptor<TDocument>>
 {
 	internal WeightedAverageValueDescriptor(Action<WeightedAverageValueDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public WeightedAverageValueDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private double? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public WeightedAverageValueDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -102,14 +101,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class WeightedAverageValueDescriptor : SerializableDescriptor<WeightedAverageValueDescriptor>
 {
 	internal WeightedAverageValueDescriptor(Action<WeightedAverageValueDescriptor> configure) => configure.Invoke(this);
+
 	public WeightedAverageValueDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private double? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
 
 	public WeightedAverageValueDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAvgAggregate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAvgAggregate.g.cs
index 3e9ac7cb080..529c9b6b8e6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAvgAggregate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/WeightedAvgAggregate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,17 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
+/// <summary>
+/// <para>Weighted average aggregation result. `value` is missing if the weight was set to zero.</para>
+/// </summary>
 public sealed partial class WeightedAvgAggregate : IAggregate
 {
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public double? Value { get; init; }
-
 	[JsonInclude, JsonPropertyName("value_as_string")]
 	public string? ValueAsString { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Analyzers.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Analyzers.g.cs
index 0cbd3d21167..3d4c9463667 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Analyzers.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Analyzers.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public partial class Analyzers : IsADictionary<string, IAnalyzer>
 {
 	public Analyzers()
@@ -40,8 +42,8 @@ public Analyzers(IDictionary<string, IAnalyzer> container) : base(container)
 
 	public void Add(string name, IAnalyzer analyzer) => BackingDictionary.Add(Sanitize(name), analyzer);
 	public bool TryGetAnalyzer(string name, [NotNullWhen(returnValue: true)] out IAnalyzer analyzer) => BackingDictionary.TryGetValue(Sanitize(name), out analyzer);
-	public bool TryGetAnalyzer<T>(string name, [NotNullWhen(returnValue: true)] out T? analyzer)
-		where T : class, IAnalyzer
+
+	public bool TryGetAnalyzer<T>(string name, [NotNullWhen(returnValue: true)] out T? analyzer) where T : class, IAnalyzer
 	{
 		if (BackingDictionary.TryGetValue(Sanitize(name), out var matchedValue) && matchedValue is T finalValue)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/AsciiFoldingTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/AsciiFoldingTokenFilter.g.cs
index f3e68648b87..2d074416b9d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/AsciiFoldingTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/AsciiFoldingTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class AsciiFoldingTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("preserve_original")]
 	public bool? PreserveOriginal { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "asciifolding";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class AsciiFoldingTokenFilter : ITokenFilter
 public sealed partial class AsciiFoldingTokenFilterDescriptor : SerializableDescriptor<AsciiFoldingTokenFilterDescriptor>, IBuildableDescriptor<AsciiFoldingTokenFilter>
 {
 	internal AsciiFoldingTokenFilterDescriptor(Action<AsciiFoldingTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public AsciiFoldingTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool? PreserveOriginalValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public AsciiFoldingTokenFilterDescriptor PreserveOriginal(bool? preserveOriginal = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CharFilters.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CharFilters.g.cs
index ad2a72faf20..d17e4f2919b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CharFilters.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CharFilters.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public partial class CharFilters : IsADictionary<string, ICharFilter>
 {
 	public CharFilters()
@@ -40,8 +42,8 @@ public CharFilters(IDictionary<string, ICharFilter> container) : base(container)
 
 	public void Add(string name, ICharFilter charFilter) => BackingDictionary.Add(Sanitize(name), charFilter);
 	public bool TryGetCharFilter(string name, [NotNullWhen(returnValue: true)] out ICharFilter charFilter) => BackingDictionary.TryGetValue(Sanitize(name), out charFilter);
-	public bool TryGetCharFilter<T>(string name, [NotNullWhen(returnValue: true)] out T? charFilter)
-		where T : class, ICharFilter
+
+	public bool TryGetCharFilter<T>(string name, [NotNullWhen(returnValue: true)] out T? charFilter) where T : class, ICharFilter
 	{
 		if (BackingDictionary.TryGetValue(Sanitize(name), out var matchedValue) && matchedValue is T finalValue)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CharGroupTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CharGroupTokenizer.g.cs
index 23766b871bb..f0939636c69 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CharGroupTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CharGroupTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class CharGroupTokenizer : ITokenizer
 {
 	[JsonInclude, JsonPropertyName("max_token_length")]
 	public int? MaxTokenLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("tokenize_on_chars")]
 	public ICollection<string> TokenizeOnChars { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "char_group";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class CharGroupTokenizer : ITokenizer
 public sealed partial class CharGroupTokenizerDescriptor : SerializableDescriptor<CharGroupTokenizerDescriptor>, IBuildableDescriptor<CharGroupTokenizer>
 {
 	internal CharGroupTokenizerDescriptor(Action<CharGroupTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public CharGroupTokenizerDescriptor() : base()
 	{
 	}
 
 	private int? MaxTokenLengthValue { get; set; }
-
 	private ICollection<string> TokenizeOnCharsValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public CharGroupTokenizerDescriptor MaxTokenLength(int? maxTokenLength)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CommonGramsTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CommonGramsTokenFilter.g.cs
index 8368592a967..768907f2514 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CommonGramsTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CommonGramsTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class CommonGramsTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("common_words")]
 	public ICollection<string>? CommonWords { get; set; }
-
 	[JsonInclude, JsonPropertyName("common_words_path")]
 	public string? CommonWordsPath { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_case")]
 	public bool? IgnoreCase { get; set; }
-
 	[JsonInclude, JsonPropertyName("query_mode")]
 	public bool? QueryMode { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "common_grams";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -49,18 +48,15 @@ public sealed partial class CommonGramsTokenFilter : ITokenFilter
 public sealed partial class CommonGramsTokenFilterDescriptor : SerializableDescriptor<CommonGramsTokenFilterDescriptor>, IBuildableDescriptor<CommonGramsTokenFilter>
 {
 	internal CommonGramsTokenFilterDescriptor(Action<CommonGramsTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public CommonGramsTokenFilterDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? CommonWordsValue { get; set; }
-
 	private string? CommonWordsPathValue { get; set; }
-
 	private bool? IgnoreCaseValue { get; set; }
-
 	private bool? QueryModeValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public CommonGramsTokenFilterDescriptor CommonWords(ICollection<string>? commonWords)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ConditionTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ConditionTokenFilter.g.cs
index 736f57f5435..191aefb74d7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ConditionTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ConditionTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class ConditionTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("filter")]
 	public ICollection<string> Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script Script { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "condition";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class ConditionTokenFilter : ITokenFilter
 public sealed partial class ConditionTokenFilterDescriptor : SerializableDescriptor<ConditionTokenFilterDescriptor>, IBuildableDescriptor<ConditionTokenFilter>
 {
 	internal ConditionTokenFilterDescriptor(Action<ConditionTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public ConditionTokenFilterDescriptor() : base()
 	{
 	}
 
 	private ICollection<string> FilterValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script ScriptValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public ConditionTokenFilterDescriptor Filter(ICollection<string> filter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CustomAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CustomAnalyzer.g.cs
index e01f4afdf78..384d1279ee8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CustomAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CustomAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,45 +25,37 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class CustomAnalyzer : IAnalyzer
 {
 	[JsonInclude, JsonPropertyName("char_filter")]
 	public ICollection<string>? CharFilter { get; set; }
-
 	[JsonInclude, JsonPropertyName("filter")]
 	public ICollection<string>? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("position_increment_gap")]
 	public int? PositionIncrementGap { get; set; }
-
 	[JsonInclude, JsonPropertyName("position_offset_gap")]
 	public int? PositionOffsetGap { get; set; }
-
 	[JsonInclude, JsonPropertyName("tokenizer")]
 	public string Tokenizer { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "custom";
 }
 
 public sealed partial class CustomAnalyzerDescriptor : SerializableDescriptor<CustomAnalyzerDescriptor>, IBuildableDescriptor<CustomAnalyzer>
 {
 	internal CustomAnalyzerDescriptor(Action<CustomAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public CustomAnalyzerDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? CharFilterValue { get; set; }
-
 	private ICollection<string>? FilterValue { get; set; }
-
 	private int? PositionIncrementGapValue { get; set; }
-
 	private int? PositionOffsetGapValue { get; set; }
-
 	private string TokenizerValue { get; set; }
 
 	public CustomAnalyzerDescriptor CharFilter(ICollection<string>? charFilter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CustomNormalizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CustomNormalizer.g.cs
index 57c2c95d107..6c94b671494 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CustomNormalizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/CustomNormalizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,30 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class CustomNormalizer : INormalizer
 {
 	[JsonInclude, JsonPropertyName("char_filter")]
 	public ICollection<string>? CharFilter { get; set; }
-
 	[JsonInclude, JsonPropertyName("filter")]
 	public ICollection<string>? Filter { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "custom";
 }
 
 public sealed partial class CustomNormalizerDescriptor : SerializableDescriptor<CustomNormalizerDescriptor>, IBuildableDescriptor<CustomNormalizer>
 {
 	internal CustomNormalizerDescriptor(Action<CustomNormalizerDescriptor> configure) => configure.Invoke(this);
+
 	public CustomNormalizerDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? CharFilterValue { get; set; }
-
 	private ICollection<string>? FilterValue { get; set; }
 
 	public CustomNormalizerDescriptor CharFilter(ICollection<string>? charFilter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DelimitedPayloadTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DelimitedPayloadTokenFilter.g.cs
index e9db5963e08..6d4c5ab5b9c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DelimitedPayloadTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DelimitedPayloadTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class DelimitedPayloadTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("delimiter")]
 	public string? Delimiter { get; set; }
-
 	[JsonInclude, JsonPropertyName("encoding")]
 	public Elastic.Clients.Elasticsearch.Analysis.DelimitedPayloadEncoding? Encoding { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "delimited_payload";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class DelimitedPayloadTokenFilter : ITokenFilter
 public sealed partial class DelimitedPayloadTokenFilterDescriptor : SerializableDescriptor<DelimitedPayloadTokenFilterDescriptor>, IBuildableDescriptor<DelimitedPayloadTokenFilter>
 {
 	internal DelimitedPayloadTokenFilterDescriptor(Action<DelimitedPayloadTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public DelimitedPayloadTokenFilterDescriptor() : base()
 	{
 	}
 
 	private string? DelimiterValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.DelimitedPayloadEncoding? EncodingValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public DelimitedPayloadTokenFilterDescriptor Delimiter(string? delimiter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DictionaryDecompounderTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DictionaryDecompounderTokenFilter.g.cs
index 71b3a65aa86..d932b660f19 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DictionaryDecompounderTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DictionaryDecompounderTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class DictionaryDecompounderTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("hyphenation_patterns_path")]
 	public string? HyphenationPatternsPath { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_subword_size")]
 	public int? MaxSubwordSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_subword_size")]
 	public int? MinSubwordSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_word_size")]
 	public int? MinWordSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("only_longest_match")]
 	public bool? OnlyLongestMatch { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "dictionary_decompounder";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
-
 	[JsonInclude, JsonPropertyName("word_list")]
 	public ICollection<string>? WordList { get; set; }
-
 	[JsonInclude, JsonPropertyName("word_list_path")]
 	public string? WordListPath { get; set; }
 }
@@ -58,24 +54,18 @@ public sealed partial class DictionaryDecompounderTokenFilter : ITokenFilter
 public sealed partial class DictionaryDecompounderTokenFilterDescriptor : SerializableDescriptor<DictionaryDecompounderTokenFilterDescriptor>, IBuildableDescriptor<DictionaryDecompounderTokenFilter>
 {
 	internal DictionaryDecompounderTokenFilterDescriptor(Action<DictionaryDecompounderTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public DictionaryDecompounderTokenFilterDescriptor() : base()
 	{
 	}
 
 	private string? HyphenationPatternsPathValue { get; set; }
-
 	private int? MaxSubwordSizeValue { get; set; }
-
 	private int? MinSubwordSizeValue { get; set; }
-
 	private int? MinWordSizeValue { get; set; }
-
 	private bool? OnlyLongestMatchValue { get; set; }
-
 	private string? VersionValue { get; set; }
-
 	private ICollection<string>? WordListValue { get; set; }
-
 	private string? WordListPathValue { get; set; }
 
 	public DictionaryDecompounderTokenFilterDescriptor HyphenationPatternsPath(string? hyphenationPatternsPath)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DutchAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DutchAnalyzer.g.cs
index 4f7c517da7f..8e22cdbfae1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DutchAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/DutchAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class DutchAnalyzer : IAnalyzer
 {
 	[JsonInclude, JsonPropertyName("stopwords")]
 	[JsonConverter(typeof(StopWordsConverter))]
 	public ICollection<string>? Stopwords { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "dutch";
 }
 
 public sealed partial class DutchAnalyzerDescriptor : SerializableDescriptor<DutchAnalyzerDescriptor>, IBuildableDescriptor<DutchAnalyzer>
 {
 	internal DutchAnalyzerDescriptor(Action<DutchAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public DutchAnalyzerDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EdgeNGramTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EdgeNGramTokenFilter.g.cs
index 445b445a5d9..289f379a6b0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EdgeNGramTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EdgeNGramTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class EdgeNGramTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("max_gram")]
 	public int? MaxGram { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_gram")]
 	public int? MinGram { get; set; }
-
 	[JsonInclude, JsonPropertyName("preserve_original")]
 	public bool? PreserveOriginal { get; set; }
-
 	[JsonInclude, JsonPropertyName("side")]
 	public Elastic.Clients.Elasticsearch.Analysis.EdgeNGramSide? Side { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "edge_ngram";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -49,18 +48,15 @@ public sealed partial class EdgeNGramTokenFilter : ITokenFilter
 public sealed partial class EdgeNGramTokenFilterDescriptor : SerializableDescriptor<EdgeNGramTokenFilterDescriptor>, IBuildableDescriptor<EdgeNGramTokenFilter>
 {
 	internal EdgeNGramTokenFilterDescriptor(Action<EdgeNGramTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public EdgeNGramTokenFilterDescriptor() : base()
 	{
 	}
 
 	private int? MaxGramValue { get; set; }
-
 	private int? MinGramValue { get; set; }
-
 	private bool? PreserveOriginalValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.EdgeNGramSide? SideValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public EdgeNGramTokenFilterDescriptor MaxGram(int? maxGram)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EdgeNGramTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EdgeNGramTokenizer.g.cs
index 967afa5973b..2847008add7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EdgeNGramTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/EdgeNGramTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class EdgeNGramTokenizer : ITokenizer
 {
 	[JsonInclude, JsonPropertyName("custom_token_chars")]
 	public string? CustomTokenChars { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_gram")]
 	public int MaxGram { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_gram")]
 	public int MinGram { get; set; }
-
 	[JsonInclude, JsonPropertyName("token_chars")]
 	public ICollection<Elastic.Clients.Elasticsearch.Analysis.TokenChar> TokenChars { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "edge_ngram";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -49,18 +48,15 @@ public sealed partial class EdgeNGramTokenizer : ITokenizer
 public sealed partial class EdgeNGramTokenizerDescriptor : SerializableDescriptor<EdgeNGramTokenizerDescriptor>, IBuildableDescriptor<EdgeNGramTokenizer>
 {
 	internal EdgeNGramTokenizerDescriptor(Action<EdgeNGramTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public EdgeNGramTokenizerDescriptor() : base()
 	{
 	}
 
 	private string? CustomTokenCharsValue { get; set; }
-
 	private int MaxGramValue { get; set; }
-
 	private int MinGramValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Analysis.TokenChar> TokenCharsValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public EdgeNGramTokenizerDescriptor CustomTokenChars(string? customTokenChars)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ElisionTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ElisionTokenFilter.g.cs
index b326f50dbf8..b88f128e4d1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ElisionTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ElisionTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class ElisionTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("articles")]
 	public ICollection<string>? Articles { get; set; }
-
 	[JsonInclude, JsonPropertyName("articles_case")]
 	public bool? ArticlesCase { get; set; }
-
 	[JsonInclude, JsonPropertyName("articles_path")]
 	public string? ArticlesPath { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "elision";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -46,16 +46,14 @@ public sealed partial class ElisionTokenFilter : ITokenFilter
 public sealed partial class ElisionTokenFilterDescriptor : SerializableDescriptor<ElisionTokenFilterDescriptor>, IBuildableDescriptor<ElisionTokenFilter>
 {
 	internal ElisionTokenFilterDescriptor(Action<ElisionTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public ElisionTokenFilterDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? ArticlesValue { get; set; }
-
 	private bool? ArticlesCaseValue { get; set; }
-
 	private string? ArticlesPathValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public ElisionTokenFilterDescriptor Articles(ICollection<string>? articles)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FingerprintAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FingerprintAnalyzer.g.cs
index 2fcd1351a20..38991f71258 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FingerprintAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FingerprintAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,29 +25,25 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class FingerprintAnalyzer : IAnalyzer
 {
 	[JsonInclude, JsonPropertyName("max_output_size")]
 	public int MaxOutputSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("preserve_original")]
 	public bool PreserveOriginal { get; set; }
-
 	[JsonInclude, JsonPropertyName("separator")]
 	public string Separator { get; set; }
-
 	[JsonInclude, JsonPropertyName("stopwords")]
 	[JsonConverter(typeof(StopWordsConverter))]
 	public ICollection<string>? Stopwords { get; set; }
-
 	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "fingerprint";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -53,20 +51,16 @@ public sealed partial class FingerprintAnalyzer : IAnalyzer
 public sealed partial class FingerprintAnalyzerDescriptor : SerializableDescriptor<FingerprintAnalyzerDescriptor>, IBuildableDescriptor<FingerprintAnalyzer>
 {
 	internal FingerprintAnalyzerDescriptor(Action<FingerprintAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public FingerprintAnalyzerDescriptor() : base()
 	{
 	}
 
 	private int MaxOutputSizeValue { get; set; }
-
 	private bool PreserveOriginalValue { get; set; }
-
 	private string SeparatorValue { get; set; }
-
 	private ICollection<string>? StopwordsValue { get; set; }
-
 	private string? StopwordsPathValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public FingerprintAnalyzerDescriptor MaxOutputSize(int maxOutputSize)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FingerprintTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FingerprintTokenFilter.g.cs
index 6e1a195e074..18a3be759fa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FingerprintTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/FingerprintTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class FingerprintTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("max_output_size")]
 	public int? MaxOutputSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("separator")]
 	public string? Separator { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "fingerprint";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class FingerprintTokenFilter : ITokenFilter
 public sealed partial class FingerprintTokenFilterDescriptor : SerializableDescriptor<FingerprintTokenFilterDescriptor>, IBuildableDescriptor<FingerprintTokenFilter>
 {
 	internal FingerprintTokenFilterDescriptor(Action<FingerprintTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public FingerprintTokenFilterDescriptor() : base()
 	{
 	}
 
 	private int? MaxOutputSizeValue { get; set; }
-
 	private string? SeparatorValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public FingerprintTokenFilterDescriptor MaxOutputSize(int? maxOutputSize)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HtmlStripCharFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HtmlStripCharFilter.g.cs
index 3318225d39d..df1e77d6b0a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HtmlStripCharFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HtmlStripCharFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class HtmlStripCharFilter : ICharFilter
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "html_strip";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class HtmlStripCharFilter : ICharFilter
 public sealed partial class HtmlStripCharFilterDescriptor : SerializableDescriptor<HtmlStripCharFilterDescriptor>, IBuildableDescriptor<HtmlStripCharFilter>
 {
 	internal HtmlStripCharFilterDescriptor(Action<HtmlStripCharFilterDescriptor> configure) => configure.Invoke(this);
+
 	public HtmlStripCharFilterDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HunspellTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HunspellTokenFilter.g.cs
index d0a3a62943b..305cea5a6a1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HunspellTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HunspellTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class HunspellTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("dedup")]
 	public bool? Dedup { get; set; }
-
 	[JsonInclude, JsonPropertyName("dictionary")]
 	public string? Dictionary { get; set; }
-
 	[JsonInclude, JsonPropertyName("locale")]
 	public string Locale { get; set; }
-
 	[JsonInclude, JsonPropertyName("longest_only")]
 	public bool? LongestOnly { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "hunspell";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -49,18 +48,15 @@ public sealed partial class HunspellTokenFilter : ITokenFilter
 public sealed partial class HunspellTokenFilterDescriptor : SerializableDescriptor<HunspellTokenFilterDescriptor>, IBuildableDescriptor<HunspellTokenFilter>
 {
 	internal HunspellTokenFilterDescriptor(Action<HunspellTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public HunspellTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool? DedupValue { get; set; }
-
 	private string? DictionaryValue { get; set; }
-
 	private string LocaleValue { get; set; }
-
 	private bool? LongestOnlyValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public HunspellTokenFilterDescriptor Dedup(bool? dedup = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HyphenationDecompounderTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HyphenationDecompounderTokenFilter.g.cs
index 6eaa382b190..a46583fa792 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HyphenationDecompounderTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/HyphenationDecompounderTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class HyphenationDecompounderTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("hyphenation_patterns_path")]
 	public string? HyphenationPatternsPath { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_subword_size")]
 	public int? MaxSubwordSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_subword_size")]
 	public int? MinSubwordSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_word_size")]
 	public int? MinWordSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("only_longest_match")]
 	public bool? OnlyLongestMatch { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "hyphenation_decompounder";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
-
 	[JsonInclude, JsonPropertyName("word_list")]
 	public ICollection<string>? WordList { get; set; }
-
 	[JsonInclude, JsonPropertyName("word_list_path")]
 	public string? WordListPath { get; set; }
 }
@@ -58,24 +54,18 @@ public sealed partial class HyphenationDecompounderTokenFilter : ITokenFilter
 public sealed partial class HyphenationDecompounderTokenFilterDescriptor : SerializableDescriptor<HyphenationDecompounderTokenFilterDescriptor>, IBuildableDescriptor<HyphenationDecompounderTokenFilter>
 {
 	internal HyphenationDecompounderTokenFilterDescriptor(Action<HyphenationDecompounderTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public HyphenationDecompounderTokenFilterDescriptor() : base()
 	{
 	}
 
 	private string? HyphenationPatternsPathValue { get; set; }
-
 	private int? MaxSubwordSizeValue { get; set; }
-
 	private int? MinSubwordSizeValue { get; set; }
-
 	private int? MinWordSizeValue { get; set; }
-
 	private bool? OnlyLongestMatchValue { get; set; }
-
 	private string? VersionValue { get; set; }
-
 	private ICollection<string>? WordListValue { get; set; }
-
 	private string? WordListPathValue { get; set; }
 
 	public HyphenationDecompounderTokenFilterDescriptor HyphenationPatternsPath(string? hyphenationPatternsPath)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuAnalyzer.g.cs
index 60baa7b4016..067eae10a7b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,30 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class IcuAnalyzer : IAnalyzer
 {
 	[JsonInclude, JsonPropertyName("method")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationType Method { get; set; }
-
 	[JsonInclude, JsonPropertyName("mode")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationMode Mode { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "icu_analyzer";
 }
 
 public sealed partial class IcuAnalyzerDescriptor : SerializableDescriptor<IcuAnalyzerDescriptor>, IBuildableDescriptor<IcuAnalyzer>
 {
 	internal IcuAnalyzerDescriptor(Action<IcuAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public IcuAnalyzerDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationType MethodValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationMode ModeValue { get; set; }
 
 	public IcuAnalyzerDescriptor Method(Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationType method)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuCollationTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuCollationTokenFilter.g.cs
index d2884ec8e55..3f3cc726fa7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuCollationTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuCollationTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,49 +25,38 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class IcuCollationTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("alternate")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuCollationAlternate? Alternate { get; set; }
-
 	[JsonInclude, JsonPropertyName("caseFirst")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuCollationCaseFirst? Casefirst { get; set; }
-
 	[JsonInclude, JsonPropertyName("caseLevel")]
 	public bool? Caselevel { get; set; }
-
 	[JsonInclude, JsonPropertyName("country")]
 	public string? Country { get; set; }
-
 	[JsonInclude, JsonPropertyName("decomposition")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuCollationDecomposition? Decomposition { get; set; }
-
 	[JsonInclude, JsonPropertyName("hiraganaQuaternaryMode")]
 	public bool? Hiraganaquaternarymode { get; set; }
-
 	[JsonInclude, JsonPropertyName("language")]
 	public string? Language { get; set; }
-
 	[JsonInclude, JsonPropertyName("numeric")]
 	public bool? Numeric { get; set; }
-
 	[JsonInclude, JsonPropertyName("rules")]
 	public string? Rules { get; set; }
-
 	[JsonInclude, JsonPropertyName("strength")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuCollationStrength? Strength { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "icu_collation";
+
 	[JsonInclude, JsonPropertyName("variableTop")]
 	public string? Variabletop { get; set; }
-
 	[JsonInclude, JsonPropertyName("variant")]
 	public string? Variant { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -73,34 +64,23 @@ public sealed partial class IcuCollationTokenFilter : ITokenFilter
 public sealed partial class IcuCollationTokenFilterDescriptor : SerializableDescriptor<IcuCollationTokenFilterDescriptor>, IBuildableDescriptor<IcuCollationTokenFilter>
 {
 	internal IcuCollationTokenFilterDescriptor(Action<IcuCollationTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public IcuCollationTokenFilterDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.IcuCollationAlternate? AlternateValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.IcuCollationCaseFirst? CasefirstValue { get; set; }
-
 	private bool? CaselevelValue { get; set; }
-
 	private string? CountryValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.IcuCollationDecomposition? DecompositionValue { get; set; }
-
 	private bool? HiraganaquaternarymodeValue { get; set; }
-
 	private string? LanguageValue { get; set; }
-
 	private bool? NumericValue { get; set; }
-
 	private string? RulesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.IcuCollationStrength? StrengthValue { get; set; }
-
 	private string? VariabletopValue { get; set; }
-
 	private string? VariantValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public IcuCollationTokenFilterDescriptor Alternate(Elastic.Clients.Elasticsearch.Analysis.IcuCollationAlternate? alternate)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuFoldingTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuFoldingTokenFilter.g.cs
index e06166bf7c4..5faf9114ef0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuFoldingTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuFoldingTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,15 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class IcuFoldingTokenFilter : ITokenFilter
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "icu_folding";
+
 	[JsonInclude, JsonPropertyName("unicode_set_filter")]
 	public string UnicodeSetFilter { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +41,12 @@ public sealed partial class IcuFoldingTokenFilter : ITokenFilter
 public sealed partial class IcuFoldingTokenFilterDescriptor : SerializableDescriptor<IcuFoldingTokenFilterDescriptor>, IBuildableDescriptor<IcuFoldingTokenFilter>
 {
 	internal IcuFoldingTokenFilterDescriptor(Action<IcuFoldingTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public IcuFoldingTokenFilterDescriptor() : base()
 	{
 	}
 
 	private string UnicodeSetFilterValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public IcuFoldingTokenFilterDescriptor UnicodeSetFilter(string unicodeSetFilter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuNormalizationCharFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuNormalizationCharFilter.g.cs
index 97ce1c8ca57..5c1bc6da67e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuNormalizationCharFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuNormalizationCharFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class IcuNormalizationCharFilter : ICharFilter
 {
 	[JsonInclude, JsonPropertyName("mode")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationMode? Mode { get; set; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationType? Name { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "icu_normalizer";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class IcuNormalizationCharFilter : ICharFilter
 public sealed partial class IcuNormalizationCharFilterDescriptor : SerializableDescriptor<IcuNormalizationCharFilterDescriptor>, IBuildableDescriptor<IcuNormalizationCharFilter>
 {
 	internal IcuNormalizationCharFilterDescriptor(Action<IcuNormalizationCharFilterDescriptor> configure) => configure.Invoke(this);
+
 	public IcuNormalizationCharFilterDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationMode? ModeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationType? NameValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public IcuNormalizationCharFilterDescriptor Mode(Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationMode? mode)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuNormalizationTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuNormalizationTokenFilter.g.cs
index 60e89580bbd..bd37eb40934 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuNormalizationTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuNormalizationTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class IcuNormalizationTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("name")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationType Name { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "icu_normalizer";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class IcuNormalizationTokenFilter : ITokenFilter
 public sealed partial class IcuNormalizationTokenFilterDescriptor : SerializableDescriptor<IcuNormalizationTokenFilterDescriptor>, IBuildableDescriptor<IcuNormalizationTokenFilter>
 {
 	internal IcuNormalizationTokenFilterDescriptor(Action<IcuNormalizationTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public IcuNormalizationTokenFilterDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationType NameValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public IcuNormalizationTokenFilterDescriptor Name(Elastic.Clients.Elasticsearch.Analysis.IcuNormalizationType name)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuTokenizer.g.cs
index 86b69373f51..11701660308 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class IcuTokenizer : ITokenFilter, ITokenizer
 {
 	[JsonInclude, JsonPropertyName("rule_files")]
 	public string RuleFiles { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "icu_tokenizer";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class IcuTokenizer : ITokenFilter, ITokenizer
 public sealed partial class IcuTokenizerDescriptor : SerializableDescriptor<IcuTokenizerDescriptor>, IBuildableDescriptor<IcuTokenizer>
 {
 	internal IcuTokenizerDescriptor(Action<IcuTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public IcuTokenizerDescriptor() : base()
 	{
 	}
 
 	private string RuleFilesValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public IcuTokenizerDescriptor RuleFiles(string ruleFiles)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuTransformTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuTransformTokenFilter.g.cs
index 47477569dee..07443891dd4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuTransformTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/IcuTransformTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class IcuTransformTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("dir")]
 	public Elastic.Clients.Elasticsearch.Analysis.IcuTransformDirection? Dir { get; set; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "icu_transform";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class IcuTransformTokenFilter : ITokenFilter
 public sealed partial class IcuTransformTokenFilterDescriptor : SerializableDescriptor<IcuTransformTokenFilterDescriptor>, IBuildableDescriptor<IcuTransformTokenFilter>
 {
 	internal IcuTransformTokenFilterDescriptor(Action<IcuTransformTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public IcuTransformTokenFilterDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.IcuTransformDirection? DirValue { get; set; }
-
 	private string IdValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public IcuTransformTokenFilterDescriptor Dir(Elastic.Clients.Elasticsearch.Analysis.IcuTransformDirection? dir)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KStemTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KStemTokenFilter.g.cs
index c7266da235e..56304afa707 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KStemTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KStemTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KStemTokenFilter : ITokenFilter
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "kstem";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class KStemTokenFilter : ITokenFilter
 public sealed partial class KStemTokenFilterDescriptor : SerializableDescriptor<KStemTokenFilterDescriptor>, IBuildableDescriptor<KStemTokenFilter>
 {
 	internal KStemTokenFilterDescriptor(Action<KStemTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public KStemTokenFilterDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeepTypesTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeepTypesTokenFilter.g.cs
index 0b9d11898a6..8f0590a2994 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeepTypesTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeepTypesTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KeepTypesTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("mode")]
 	public Elastic.Clients.Elasticsearch.Analysis.KeepTypesMode? Mode { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "keep_types";
+
 	[JsonInclude, JsonPropertyName("types")]
 	public ICollection<string>? Types { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class KeepTypesTokenFilter : ITokenFilter
 public sealed partial class KeepTypesTokenFilterDescriptor : SerializableDescriptor<KeepTypesTokenFilterDescriptor>, IBuildableDescriptor<KeepTypesTokenFilter>
 {
 	internal KeepTypesTokenFilterDescriptor(Action<KeepTypesTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public KeepTypesTokenFilterDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.KeepTypesMode? ModeValue { get; set; }
-
 	private ICollection<string>? TypesValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public KeepTypesTokenFilterDescriptor Mode(Elastic.Clients.Elasticsearch.Analysis.KeepTypesMode? mode)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeepWordsTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeepWordsTokenFilter.g.cs
index 135e216b246..2020fa30480 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeepWordsTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeepWordsTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KeepWordsTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("keep_words")]
 	public ICollection<string>? KeepWords { get; set; }
-
 	[JsonInclude, JsonPropertyName("keep_words_case")]
 	public bool? KeepWordsCase { get; set; }
-
 	[JsonInclude, JsonPropertyName("keep_words_path")]
 	public string? KeepWordsPath { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "keep";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -46,16 +46,14 @@ public sealed partial class KeepWordsTokenFilter : ITokenFilter
 public sealed partial class KeepWordsTokenFilterDescriptor : SerializableDescriptor<KeepWordsTokenFilterDescriptor>, IBuildableDescriptor<KeepWordsTokenFilter>
 {
 	internal KeepWordsTokenFilterDescriptor(Action<KeepWordsTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public KeepWordsTokenFilterDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? KeepWordsValue { get; set; }
-
 	private bool? KeepWordsCaseValue { get; set; }
-
 	private string? KeepWordsPathValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public KeepWordsTokenFilterDescriptor KeepWords(ICollection<string>? keepWords)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordAnalyzer.g.cs
index c83f9e00dc4..8dc07905af1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KeywordAnalyzer : IAnalyzer
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "keyword";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class KeywordAnalyzer : IAnalyzer
 public sealed partial class KeywordAnalyzerDescriptor : SerializableDescriptor<KeywordAnalyzerDescriptor>, IBuildableDescriptor<KeywordAnalyzer>
 {
 	internal KeywordAnalyzerDescriptor(Action<KeywordAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public KeywordAnalyzerDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordMarkerTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordMarkerTokenFilter.g.cs
index f5ee5cd4a93..2733ce473df 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordMarkerTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordMarkerTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KeywordMarkerTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("ignore_case")]
 	public bool? IgnoreCase { get; set; }
-
 	[JsonInclude, JsonPropertyName("keywords")]
 	public ICollection<string>? Keywords { get; set; }
-
 	[JsonInclude, JsonPropertyName("keywords_path")]
 	public string? KeywordsPath { get; set; }
-
 	[JsonInclude, JsonPropertyName("keywords_pattern")]
 	public string? KeywordsPattern { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "keyword_marker";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -49,18 +48,15 @@ public sealed partial class KeywordMarkerTokenFilter : ITokenFilter
 public sealed partial class KeywordMarkerTokenFilterDescriptor : SerializableDescriptor<KeywordMarkerTokenFilterDescriptor>, IBuildableDescriptor<KeywordMarkerTokenFilter>
 {
 	internal KeywordMarkerTokenFilterDescriptor(Action<KeywordMarkerTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public KeywordMarkerTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool? IgnoreCaseValue { get; set; }
-
 	private ICollection<string>? KeywordsValue { get; set; }
-
 	private string? KeywordsPathValue { get; set; }
-
 	private string? KeywordsPatternValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public KeywordMarkerTokenFilterDescriptor IgnoreCase(bool? ignoreCase = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordTokenizer.g.cs
index dd659f92b7e..fe0b14700f5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KeywordTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KeywordTokenizer : ITokenizer
 {
 	[JsonInclude, JsonPropertyName("buffer_size")]
 	public int BufferSize { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "keyword";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class KeywordTokenizer : ITokenizer
 public sealed partial class KeywordTokenizerDescriptor : SerializableDescriptor<KeywordTokenizerDescriptor>, IBuildableDescriptor<KeywordTokenizer>
 {
 	internal KeywordTokenizerDescriptor(Action<KeywordTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public KeywordTokenizerDescriptor() : base()
 	{
 	}
 
 	private int BufferSizeValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public KeywordTokenizerDescriptor BufferSize(int bufferSize)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiAnalyzer.g.cs
index 1c809719579..ff705e275ce 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KuromojiAnalyzer : IAnalyzer
 {
 	[JsonInclude, JsonPropertyName("mode")]
 	public Elastic.Clients.Elasticsearch.Analysis.KuromojiTokenizationMode Mode { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "kuromoji";
+
 	[JsonInclude, JsonPropertyName("user_dictionary")]
 	public string? UserDictionary { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class KuromojiAnalyzer : IAnalyzer
 public sealed partial class KuromojiAnalyzerDescriptor : SerializableDescriptor<KuromojiAnalyzerDescriptor>, IBuildableDescriptor<KuromojiAnalyzer>
 {
 	internal KuromojiAnalyzerDescriptor(Action<KuromojiAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public KuromojiAnalyzerDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.KuromojiTokenizationMode ModeValue { get; set; }
-
 	private string? UserDictionaryValue { get; set; }
 
 	public KuromojiAnalyzerDescriptor Mode(Elastic.Clients.Elasticsearch.Analysis.KuromojiTokenizationMode mode)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiIterationMarkCharFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiIterationMarkCharFilter.g.cs
index 9738524a9b9..59b749d4230 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiIterationMarkCharFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiIterationMarkCharFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KuromojiIterationMarkCharFilter : ICharFilter
 {
 	[JsonInclude, JsonPropertyName("normalize_kana")]
 	public bool NormalizeKana { get; set; }
-
 	[JsonInclude, JsonPropertyName("normalize_kanji")]
 	public bool NormalizeKanji { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "kuromoji_iteration_mark";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class KuromojiIterationMarkCharFilter : ICharFilter
 public sealed partial class KuromojiIterationMarkCharFilterDescriptor : SerializableDescriptor<KuromojiIterationMarkCharFilterDescriptor>, IBuildableDescriptor<KuromojiIterationMarkCharFilter>
 {
 	internal KuromojiIterationMarkCharFilterDescriptor(Action<KuromojiIterationMarkCharFilterDescriptor> configure) => configure.Invoke(this);
+
 	public KuromojiIterationMarkCharFilterDescriptor() : base()
 	{
 	}
 
 	private bool NormalizeKanaValue { get; set; }
-
 	private bool NormalizeKanjiValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public KuromojiIterationMarkCharFilterDescriptor NormalizeKana(bool normalizeKana = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiPartOfSpeechTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiPartOfSpeechTokenFilter.g.cs
index c2fddc395d7..66f9234645e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiPartOfSpeechTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiPartOfSpeechTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KuromojiPartOfSpeechTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("stoptags")]
 	public ICollection<string> Stoptags { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "kuromoji_part_of_speech";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class KuromojiPartOfSpeechTokenFilter : ITokenFilter
 public sealed partial class KuromojiPartOfSpeechTokenFilterDescriptor : SerializableDescriptor<KuromojiPartOfSpeechTokenFilterDescriptor>, IBuildableDescriptor<KuromojiPartOfSpeechTokenFilter>
 {
 	internal KuromojiPartOfSpeechTokenFilterDescriptor(Action<KuromojiPartOfSpeechTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public KuromojiPartOfSpeechTokenFilterDescriptor() : base()
 	{
 	}
 
 	private ICollection<string> StoptagsValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public KuromojiPartOfSpeechTokenFilterDescriptor Stoptags(ICollection<string> stoptags)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiReadingFormTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiReadingFormTokenFilter.g.cs
index e21c5f45f5c..c2a01a5b069 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiReadingFormTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiReadingFormTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,15 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KuromojiReadingFormTokenFilter : ITokenFilter
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "kuromoji_readingform";
+
 	[JsonInclude, JsonPropertyName("use_romaji")]
 	public bool UseRomaji { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +41,12 @@ public sealed partial class KuromojiReadingFormTokenFilter : ITokenFilter
 public sealed partial class KuromojiReadingFormTokenFilterDescriptor : SerializableDescriptor<KuromojiReadingFormTokenFilterDescriptor>, IBuildableDescriptor<KuromojiReadingFormTokenFilter>
 {
 	internal KuromojiReadingFormTokenFilterDescriptor(Action<KuromojiReadingFormTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public KuromojiReadingFormTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool UseRomajiValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public KuromojiReadingFormTokenFilterDescriptor UseRomaji(bool useRomaji = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiStemmerTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiStemmerTokenFilter.g.cs
index fd4c740d9da..2f0e877cea1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiStemmerTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiStemmerTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KuromojiStemmerTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("minimum_length")]
 	public int MinimumLength { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "kuromoji_stemmer";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class KuromojiStemmerTokenFilter : ITokenFilter
 public sealed partial class KuromojiStemmerTokenFilterDescriptor : SerializableDescriptor<KuromojiStemmerTokenFilterDescriptor>, IBuildableDescriptor<KuromojiStemmerTokenFilter>
 {
 	internal KuromojiStemmerTokenFilterDescriptor(Action<KuromojiStemmerTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public KuromojiStemmerTokenFilterDescriptor() : base()
 	{
 	}
 
 	private int MinimumLengthValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public KuromojiStemmerTokenFilterDescriptor MinimumLength(int minimumLength)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiTokenizer.g.cs
index 165b7de1890..2d0304282fe 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/KuromojiTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class KuromojiTokenizer : ITokenizer
 {
 	[JsonInclude, JsonPropertyName("discard_compound_token")]
 	public bool? DiscardCompoundToken { get; set; }
-
 	[JsonInclude, JsonPropertyName("discard_punctuation")]
 	public bool? DiscardPunctuation { get; set; }
-
 	[JsonInclude, JsonPropertyName("mode")]
 	public Elastic.Clients.Elasticsearch.Analysis.KuromojiTokenizationMode Mode { get; set; }
-
 	[JsonInclude, JsonPropertyName("nbest_cost")]
 	public int? NbestCost { get; set; }
-
 	[JsonInclude, JsonPropertyName("nbest_examples")]
 	public string? NbestExamples { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "kuromoji_tokenizer";
+
 	[JsonInclude, JsonPropertyName("user_dictionary")]
 	public string? UserDictionary { get; set; }
-
 	[JsonInclude, JsonPropertyName("user_dictionary_rules")]
 	public ICollection<string>? UserDictionaryRules { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -58,24 +54,18 @@ public sealed partial class KuromojiTokenizer : ITokenizer
 public sealed partial class KuromojiTokenizerDescriptor : SerializableDescriptor<KuromojiTokenizerDescriptor>, IBuildableDescriptor<KuromojiTokenizer>
 {
 	internal KuromojiTokenizerDescriptor(Action<KuromojiTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public KuromojiTokenizerDescriptor() : base()
 	{
 	}
 
 	private bool? DiscardCompoundTokenValue { get; set; }
-
 	private bool? DiscardPunctuationValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.KuromojiTokenizationMode ModeValue { get; set; }
-
 	private int? NbestCostValue { get; set; }
-
 	private string? NbestExamplesValue { get; set; }
-
 	private string? UserDictionaryValue { get; set; }
-
 	private ICollection<string>? UserDictionaryRulesValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public KuromojiTokenizerDescriptor DiscardCompoundToken(bool? discardCompoundToken = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LanguageAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LanguageAnalyzer.g.cs
index 4a223a5a316..e81b7fcd18d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LanguageAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LanguageAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,26 +25,23 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class LanguageAnalyzer : IAnalyzer
 {
 	[JsonInclude, JsonPropertyName("language")]
 	public Elastic.Clients.Elasticsearch.Analysis.Language Language { get; set; }
-
 	[JsonInclude, JsonPropertyName("stem_exclusion")]
 	public ICollection<string> StemExclusion { get; set; }
-
 	[JsonInclude, JsonPropertyName("stopwords")]
 	[JsonConverter(typeof(StopWordsConverter))]
 	public ICollection<string>? Stopwords { get; set; }
-
 	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "language";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -50,18 +49,15 @@ public sealed partial class LanguageAnalyzer : IAnalyzer
 public sealed partial class LanguageAnalyzerDescriptor : SerializableDescriptor<LanguageAnalyzerDescriptor>, IBuildableDescriptor<LanguageAnalyzer>
 {
 	internal LanguageAnalyzerDescriptor(Action<LanguageAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public LanguageAnalyzerDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.Language LanguageValue { get; set; }
-
 	private ICollection<string> StemExclusionValue { get; set; }
-
 	private ICollection<string>? StopwordsValue { get; set; }
-
 	private string? StopwordsPathValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public LanguageAnalyzerDescriptor Language(Elastic.Clients.Elasticsearch.Analysis.Language language)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LengthTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LengthTokenFilter.g.cs
index 7e6dcdaad63..54364641b07 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LengthTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LengthTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class LengthTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("max")]
 	public int? Max { get; set; }
-
 	[JsonInclude, JsonPropertyName("min")]
 	public int? Min { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "length";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class LengthTokenFilter : ITokenFilter
 public sealed partial class LengthTokenFilterDescriptor : SerializableDescriptor<LengthTokenFilterDescriptor>, IBuildableDescriptor<LengthTokenFilter>
 {
 	internal LengthTokenFilterDescriptor(Action<LengthTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public LengthTokenFilterDescriptor() : base()
 	{
 	}
 
 	private int? MaxValue { get; set; }
-
 	private int? MinValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public LengthTokenFilterDescriptor Max(int? max)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LetterTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LetterTokenizer.g.cs
index fbe44ff81ca..66fd0858f1a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LetterTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LetterTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class LetterTokenizer : ITokenizer
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "letter";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class LetterTokenizer : ITokenizer
 public sealed partial class LetterTokenizerDescriptor : SerializableDescriptor<LetterTokenizerDescriptor>, IBuildableDescriptor<LetterTokenizer>
 {
 	internal LetterTokenizerDescriptor(Action<LetterTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public LetterTokenizerDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LimitTokenCountTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LimitTokenCountTokenFilter.g.cs
index fbd088e8579..2212d070c41 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LimitTokenCountTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LimitTokenCountTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class LimitTokenCountTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("consume_all_tokens")]
 	public bool? ConsumeAllTokens { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_token_count")]
 	public int? MaxTokenCount { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "limit";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class LimitTokenCountTokenFilter : ITokenFilter
 public sealed partial class LimitTokenCountTokenFilterDescriptor : SerializableDescriptor<LimitTokenCountTokenFilterDescriptor>, IBuildableDescriptor<LimitTokenCountTokenFilter>
 {
 	internal LimitTokenCountTokenFilterDescriptor(Action<LimitTokenCountTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public LimitTokenCountTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool? ConsumeAllTokensValue { get; set; }
-
 	private int? MaxTokenCountValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public LimitTokenCountTokenFilterDescriptor ConsumeAllTokens(bool? consumeAllTokens = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseNormalizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseNormalizer.g.cs
index 710e932bded..7ef6a2cf841 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseNormalizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseNormalizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,18 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class LowercaseNormalizer : INormalizer
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "lowercase";
 }
 
 public sealed partial class LowercaseNormalizerDescriptor : SerializableDescriptor<LowercaseNormalizerDescriptor>, IBuildableDescriptor<LowercaseNormalizer>
 {
 	internal LowercaseNormalizerDescriptor(Action<LowercaseNormalizerDescriptor> configure) => configure.Invoke(this);
+
 	public LowercaseNormalizerDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseTokenFilter.g.cs
index 85858c102fe..ce81678c2be 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class LowercaseTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("language")]
 	public string? Language { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "lowercase";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class LowercaseTokenFilter : ITokenFilter
 public sealed partial class LowercaseTokenFilterDescriptor : SerializableDescriptor<LowercaseTokenFilterDescriptor>, IBuildableDescriptor<LowercaseTokenFilter>
 {
 	internal LowercaseTokenFilterDescriptor(Action<LowercaseTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public LowercaseTokenFilterDescriptor() : base()
 	{
 	}
 
 	private string? LanguageValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public LowercaseTokenFilterDescriptor Language(string? language)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseTokenizer.g.cs
index bd52bdb1180..eadc1a9d758 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/LowercaseTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class LowercaseTokenizer : ITokenizer
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "lowercase";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class LowercaseTokenizer : ITokenizer
 public sealed partial class LowercaseTokenizerDescriptor : SerializableDescriptor<LowercaseTokenizerDescriptor>, IBuildableDescriptor<LowercaseTokenizer>
 {
 	internal LowercaseTokenizerDescriptor(Action<LowercaseTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public LowercaseTokenizerDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/MappingCharFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/MappingCharFilter.g.cs
index 5a4c802e9e6..827b99af2f1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/MappingCharFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/MappingCharFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class MappingCharFilter : ICharFilter
 {
 	[JsonInclude, JsonPropertyName("mappings")]
 	public ICollection<string>? Mappings { get; set; }
-
 	[JsonInclude, JsonPropertyName("mappings_path")]
 	public string? MappingsPath { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "mapping";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class MappingCharFilter : ICharFilter
 public sealed partial class MappingCharFilterDescriptor : SerializableDescriptor<MappingCharFilterDescriptor>, IBuildableDescriptor<MappingCharFilter>
 {
 	internal MappingCharFilterDescriptor(Action<MappingCharFilterDescriptor> configure) => configure.Invoke(this);
+
 	public MappingCharFilterDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? MappingsValue { get; set; }
-
 	private string? MappingsPathValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public MappingCharFilterDescriptor Mappings(ICollection<string>? mappings)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/MultiplexerTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/MultiplexerTokenFilter.g.cs
index bab9a499343..6e9f2aeee33 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/MultiplexerTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/MultiplexerTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class MultiplexerTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("filters")]
 	public ICollection<string> Filters { get; set; }
-
 	[JsonInclude, JsonPropertyName("preserve_original")]
 	public bool? PreserveOriginal { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "multiplexer";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class MultiplexerTokenFilter : ITokenFilter
 public sealed partial class MultiplexerTokenFilterDescriptor : SerializableDescriptor<MultiplexerTokenFilterDescriptor>, IBuildableDescriptor<MultiplexerTokenFilter>
 {
 	internal MultiplexerTokenFilterDescriptor(Action<MultiplexerTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public MultiplexerTokenFilterDescriptor() : base()
 	{
 	}
 
 	private ICollection<string> FiltersValue { get; set; }
-
 	private bool? PreserveOriginalValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public MultiplexerTokenFilterDescriptor Filters(ICollection<string> filters)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NGramTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NGramTokenFilter.g.cs
index 955c7ca23d3..581d606b643 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NGramTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NGramTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class NGramTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("max_gram")]
 	public int? MaxGram { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_gram")]
 	public int? MinGram { get; set; }
-
 	[JsonInclude, JsonPropertyName("preserve_original")]
 	public bool? PreserveOriginal { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "ngram";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -46,16 +46,14 @@ public sealed partial class NGramTokenFilter : ITokenFilter
 public sealed partial class NGramTokenFilterDescriptor : SerializableDescriptor<NGramTokenFilterDescriptor>, IBuildableDescriptor<NGramTokenFilter>
 {
 	internal NGramTokenFilterDescriptor(Action<NGramTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public NGramTokenFilterDescriptor() : base()
 	{
 	}
 
 	private int? MaxGramValue { get; set; }
-
 	private int? MinGramValue { get; set; }
-
 	private bool? PreserveOriginalValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public NGramTokenFilterDescriptor MaxGram(int? maxGram)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NGramTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NGramTokenizer.g.cs
index dcc01691ac8..80c95e91101 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NGramTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NGramTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class NGramTokenizer : ITokenizer
 {
 	[JsonInclude, JsonPropertyName("custom_token_chars")]
 	public string? CustomTokenChars { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_gram")]
 	public int MaxGram { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_gram")]
 	public int MinGram { get; set; }
-
 	[JsonInclude, JsonPropertyName("token_chars")]
 	public ICollection<Elastic.Clients.Elasticsearch.Analysis.TokenChar> TokenChars { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "ngram";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -49,18 +48,15 @@ public sealed partial class NGramTokenizer : ITokenizer
 public sealed partial class NGramTokenizerDescriptor : SerializableDescriptor<NGramTokenizerDescriptor>, IBuildableDescriptor<NGramTokenizer>
 {
 	internal NGramTokenizerDescriptor(Action<NGramTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public NGramTokenizerDescriptor() : base()
 	{
 	}
 
 	private string? CustomTokenCharsValue { get; set; }
-
 	private int MaxGramValue { get; set; }
-
 	private int MinGramValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Analysis.TokenChar> TokenCharsValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public NGramTokenizerDescriptor CustomTokenChars(string? customTokenChars)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriAnalyzer.g.cs
index 4597bd6344f..73b447c6bd4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class NoriAnalyzer : IAnalyzer
 {
 	[JsonInclude, JsonPropertyName("decompound_mode")]
 	public Elastic.Clients.Elasticsearch.Analysis.NoriDecompoundMode? DecompoundMode { get; set; }
-
 	[JsonInclude, JsonPropertyName("stoptags")]
 	public ICollection<string>? Stoptags { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "nori";
+
 	[JsonInclude, JsonPropertyName("user_dictionary")]
 	public string? UserDictionary { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -46,16 +46,14 @@ public sealed partial class NoriAnalyzer : IAnalyzer
 public sealed partial class NoriAnalyzerDescriptor : SerializableDescriptor<NoriAnalyzerDescriptor>, IBuildableDescriptor<NoriAnalyzer>
 {
 	internal NoriAnalyzerDescriptor(Action<NoriAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public NoriAnalyzerDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.NoriDecompoundMode? DecompoundModeValue { get; set; }
-
 	private ICollection<string>? StoptagsValue { get; set; }
-
 	private string? UserDictionaryValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public NoriAnalyzerDescriptor DecompoundMode(Elastic.Clients.Elasticsearch.Analysis.NoriDecompoundMode? decompoundMode)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriPartOfSpeechTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriPartOfSpeechTokenFilter.g.cs
index d1a2a76239c..c06c611c9fd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriPartOfSpeechTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriPartOfSpeechTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class NoriPartOfSpeechTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("stoptags")]
 	public ICollection<string>? Stoptags { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "nori_part_of_speech";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class NoriPartOfSpeechTokenFilter : ITokenFilter
 public sealed partial class NoriPartOfSpeechTokenFilterDescriptor : SerializableDescriptor<NoriPartOfSpeechTokenFilterDescriptor>, IBuildableDescriptor<NoriPartOfSpeechTokenFilter>
 {
 	internal NoriPartOfSpeechTokenFilterDescriptor(Action<NoriPartOfSpeechTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public NoriPartOfSpeechTokenFilterDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? StoptagsValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public NoriPartOfSpeechTokenFilterDescriptor Stoptags(ICollection<string>? stoptags)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriTokenizer.g.cs
index 5f6ba2ad052..e61d0ada48b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/NoriTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class NoriTokenizer : ITokenizer
 {
 	[JsonInclude, JsonPropertyName("decompound_mode")]
 	public Elastic.Clients.Elasticsearch.Analysis.NoriDecompoundMode? DecompoundMode { get; set; }
-
 	[JsonInclude, JsonPropertyName("discard_punctuation")]
 	public bool? DiscardPunctuation { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "nori_tokenizer";
+
 	[JsonInclude, JsonPropertyName("user_dictionary")]
 	public string? UserDictionary { get; set; }
-
 	[JsonInclude, JsonPropertyName("user_dictionary_rules")]
 	public ICollection<string>? UserDictionaryRules { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -49,18 +48,15 @@ public sealed partial class NoriTokenizer : ITokenizer
 public sealed partial class NoriTokenizerDescriptor : SerializableDescriptor<NoriTokenizerDescriptor>, IBuildableDescriptor<NoriTokenizer>
 {
 	internal NoriTokenizerDescriptor(Action<NoriTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public NoriTokenizerDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.NoriDecompoundMode? DecompoundModeValue { get; set; }
-
 	private bool? DiscardPunctuationValue { get; set; }
-
 	private string? UserDictionaryValue { get; set; }
-
 	private ICollection<string>? UserDictionaryRulesValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public NoriTokenizerDescriptor DecompoundMode(Elastic.Clients.Elasticsearch.Analysis.NoriDecompoundMode? decompoundMode)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Normalizers.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Normalizers.g.cs
index de5ab187e90..6fd0bd4bdf3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Normalizers.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Normalizers.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public partial class Normalizers : IsADictionary<string, INormalizer>
 {
 	public Normalizers()
@@ -40,8 +42,8 @@ public Normalizers(IDictionary<string, INormalizer> container) : base(container)
 
 	public void Add(string name, INormalizer normalizer) => BackingDictionary.Add(Sanitize(name), normalizer);
 	public bool TryGetNormalizer(string name, [NotNullWhen(returnValue: true)] out INormalizer normalizer) => BackingDictionary.TryGetValue(Sanitize(name), out normalizer);
-	public bool TryGetNormalizer<T>(string name, [NotNullWhen(returnValue: true)] out T? normalizer)
-		where T : class, INormalizer
+
+	public bool TryGetNormalizer<T>(string name, [NotNullWhen(returnValue: true)] out T? normalizer) where T : class, INormalizer
 	{
 		if (BackingDictionary.TryGetValue(Sanitize(name), out var matchedValue) && matchedValue is T finalValue)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PathHierarchyTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PathHierarchyTokenizer.g.cs
index 98750188a80..080b448a96b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PathHierarchyTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PathHierarchyTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class PathHierarchyTokenizer : ITokenizer
 {
 	[JsonInclude, JsonPropertyName("buffer_size")]
 	public int BufferSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("delimiter")]
 	public string Delimiter { get; set; }
-
 	[JsonInclude, JsonPropertyName("replacement")]
 	public string Replacement { get; set; }
-
 	[JsonInclude, JsonPropertyName("reverse")]
 	public bool Reverse { get; set; }
-
 	[JsonInclude, JsonPropertyName("skip")]
 	public int Skip { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "path_hierarchy";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -52,20 +50,16 @@ public sealed partial class PathHierarchyTokenizer : ITokenizer
 public sealed partial class PathHierarchyTokenizerDescriptor : SerializableDescriptor<PathHierarchyTokenizerDescriptor>, IBuildableDescriptor<PathHierarchyTokenizer>
 {
 	internal PathHierarchyTokenizerDescriptor(Action<PathHierarchyTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public PathHierarchyTokenizerDescriptor() : base()
 	{
 	}
 
 	private int BufferSizeValue { get; set; }
-
 	private string DelimiterValue { get; set; }
-
 	private string ReplacementValue { get; set; }
-
 	private bool ReverseValue { get; set; }
-
 	private int SkipValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public PathHierarchyTokenizerDescriptor BufferSize(int bufferSize)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternAnalyzer.g.cs
index 006add309ca..9b3627fc648 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,26 +25,23 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class PatternAnalyzer : IAnalyzer
 {
 	[JsonInclude, JsonPropertyName("flags")]
 	public string? Flags { get; set; }
-
 	[JsonInclude, JsonPropertyName("lowercase")]
 	public bool? Lowercase { get; set; }
-
 	[JsonInclude, JsonPropertyName("pattern")]
 	public string Pattern { get; set; }
-
 	[JsonInclude, JsonPropertyName("stopwords")]
 	[JsonConverter(typeof(StopWordsConverter))]
 	public ICollection<string>? Stopwords { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "pattern";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -50,18 +49,15 @@ public sealed partial class PatternAnalyzer : IAnalyzer
 public sealed partial class PatternAnalyzerDescriptor : SerializableDescriptor<PatternAnalyzerDescriptor>, IBuildableDescriptor<PatternAnalyzer>
 {
 	internal PatternAnalyzerDescriptor(Action<PatternAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public PatternAnalyzerDescriptor() : base()
 	{
 	}
 
 	private string? FlagsValue { get; set; }
-
 	private bool? LowercaseValue { get; set; }
-
 	private string PatternValue { get; set; }
-
 	private ICollection<string>? StopwordsValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public PatternAnalyzerDescriptor Flags(string? flags)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternCaptureTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternCaptureTokenFilter.g.cs
index 7c0c490d0dd..ae015f9e1ff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternCaptureTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternCaptureTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class PatternCaptureTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("patterns")]
 	public ICollection<string> Patterns { get; set; }
-
 	[JsonInclude, JsonPropertyName("preserve_original")]
 	public bool? PreserveOriginal { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "pattern_capture";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class PatternCaptureTokenFilter : ITokenFilter
 public sealed partial class PatternCaptureTokenFilterDescriptor : SerializableDescriptor<PatternCaptureTokenFilterDescriptor>, IBuildableDescriptor<PatternCaptureTokenFilter>
 {
 	internal PatternCaptureTokenFilterDescriptor(Action<PatternCaptureTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public PatternCaptureTokenFilterDescriptor() : base()
 	{
 	}
 
 	private ICollection<string> PatternsValue { get; set; }
-
 	private bool? PreserveOriginalValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public PatternCaptureTokenFilterDescriptor Patterns(ICollection<string> patterns)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternReplaceCharFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternReplaceCharFilter.g.cs
index adf5f82880b..d7d185eedec 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternReplaceCharFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternReplaceCharFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class PatternReplaceCharFilter : ICharFilter
 {
 	[JsonInclude, JsonPropertyName("flags")]
 	public string? Flags { get; set; }
-
 	[JsonInclude, JsonPropertyName("pattern")]
 	public string Pattern { get; set; }
-
 	[JsonInclude, JsonPropertyName("replacement")]
 	public string? Replacement { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "pattern_replace";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -46,16 +46,14 @@ public sealed partial class PatternReplaceCharFilter : ICharFilter
 public sealed partial class PatternReplaceCharFilterDescriptor : SerializableDescriptor<PatternReplaceCharFilterDescriptor>, IBuildableDescriptor<PatternReplaceCharFilter>
 {
 	internal PatternReplaceCharFilterDescriptor(Action<PatternReplaceCharFilterDescriptor> configure) => configure.Invoke(this);
+
 	public PatternReplaceCharFilterDescriptor() : base()
 	{
 	}
 
 	private string? FlagsValue { get; set; }
-
 	private string PatternValue { get; set; }
-
 	private string? ReplacementValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public PatternReplaceCharFilterDescriptor Flags(string? flags)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternReplaceTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternReplaceTokenFilter.g.cs
index 2ee582b533c..5ea37ee2460 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternReplaceTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternReplaceTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class PatternReplaceTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("all")]
 	public bool? All { get; set; }
-
 	[JsonInclude, JsonPropertyName("flags")]
 	public string? Flags { get; set; }
-
 	[JsonInclude, JsonPropertyName("pattern")]
 	public string Pattern { get; set; }
-
 	[JsonInclude, JsonPropertyName("replacement")]
 	public string? Replacement { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "pattern_replace";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -49,18 +48,15 @@ public sealed partial class PatternReplaceTokenFilter : ITokenFilter
 public sealed partial class PatternReplaceTokenFilterDescriptor : SerializableDescriptor<PatternReplaceTokenFilterDescriptor>, IBuildableDescriptor<PatternReplaceTokenFilter>
 {
 	internal PatternReplaceTokenFilterDescriptor(Action<PatternReplaceTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public PatternReplaceTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool? AllValue { get; set; }
-
 	private string? FlagsValue { get; set; }
-
 	private string PatternValue { get; set; }
-
 	private string? ReplacementValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public PatternReplaceTokenFilterDescriptor All(bool? all = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternTokenizer.g.cs
index 46bfe1ceece..2a8355e304e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PatternTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class PatternTokenizer : ITokenizer
 {
 	[JsonInclude, JsonPropertyName("flags")]
 	public string Flags { get; set; }
-
 	[JsonInclude, JsonPropertyName("group")]
 	public int Group { get; set; }
-
 	[JsonInclude, JsonPropertyName("pattern")]
 	public string Pattern { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "pattern";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -46,16 +46,14 @@ public sealed partial class PatternTokenizer : ITokenizer
 public sealed partial class PatternTokenizerDescriptor : SerializableDescriptor<PatternTokenizerDescriptor>, IBuildableDescriptor<PatternTokenizer>
 {
 	internal PatternTokenizerDescriptor(Action<PatternTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public PatternTokenizerDescriptor() : base()
 	{
 	}
 
 	private string FlagsValue { get; set; }
-
 	private int GroupValue { get; set; }
-
 	private string PatternValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public PatternTokenizerDescriptor Flags(string flags)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PhoneticTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PhoneticTokenFilter.g.cs
index 8faec44f1a7..8c8e9b29e91 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PhoneticTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PhoneticTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class PhoneticTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("encoder")]
 	public Elastic.Clients.Elasticsearch.Analysis.PhoneticEncoder Encoder { get; set; }
-
 	[JsonInclude, JsonPropertyName("languageset")]
 	public ICollection<Elastic.Clients.Elasticsearch.Analysis.PhoneticLanguage> Languageset { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_code_len")]
 	public int? MaxCodeLen { get; set; }
-
 	[JsonInclude, JsonPropertyName("name_type")]
 	public Elastic.Clients.Elasticsearch.Analysis.PhoneticNameType NameType { get; set; }
-
 	[JsonInclude, JsonPropertyName("replace")]
 	public bool? Replace { get; set; }
-
 	[JsonInclude, JsonPropertyName("rule_type")]
 	public Elastic.Clients.Elasticsearch.Analysis.PhoneticRuleType RuleType { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "phonetic";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -55,22 +52,17 @@ public sealed partial class PhoneticTokenFilter : ITokenFilter
 public sealed partial class PhoneticTokenFilterDescriptor : SerializableDescriptor<PhoneticTokenFilterDescriptor>, IBuildableDescriptor<PhoneticTokenFilter>
 {
 	internal PhoneticTokenFilterDescriptor(Action<PhoneticTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public PhoneticTokenFilterDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.PhoneticEncoder EncoderValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Analysis.PhoneticLanguage> LanguagesetValue { get; set; }
-
 	private int? MaxCodeLenValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.PhoneticNameType NameTypeValue { get; set; }
-
 	private bool? ReplaceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.PhoneticRuleType RuleTypeValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public PhoneticTokenFilterDescriptor Encoder(Elastic.Clients.Elasticsearch.Analysis.PhoneticEncoder encoder)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PorterStemTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PorterStemTokenFilter.g.cs
index c8bf4009121..f30bd95634c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PorterStemTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PorterStemTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class PorterStemTokenFilter : ITokenFilter
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "porter_stem";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class PorterStemTokenFilter : ITokenFilter
 public sealed partial class PorterStemTokenFilterDescriptor : SerializableDescriptor<PorterStemTokenFilterDescriptor>, IBuildableDescriptor<PorterStemTokenFilter>
 {
 	internal PorterStemTokenFilterDescriptor(Action<PorterStemTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public PorterStemTokenFilterDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PredicateTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PredicateTokenFilter.g.cs
index 1ee2e29154e..06f3ba61a24 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PredicateTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/PredicateTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class PredicateTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script Script { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "predicate_token_filter";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class PredicateTokenFilter : ITokenFilter
 public sealed partial class PredicateTokenFilterDescriptor : SerializableDescriptor<PredicateTokenFilterDescriptor>, IBuildableDescriptor<PredicateTokenFilter>
 {
 	internal PredicateTokenFilterDescriptor(Action<PredicateTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public PredicateTokenFilterDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Script ScriptValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public PredicateTokenFilterDescriptor Script(Elastic.Clients.Elasticsearch.Script script)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RemoveDuplicatesTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RemoveDuplicatesTokenFilter.g.cs
index e05e976b69f..af877d0cb81 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RemoveDuplicatesTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/RemoveDuplicatesTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class RemoveDuplicatesTokenFilter : ITokenFilter
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "remove_duplicates";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class RemoveDuplicatesTokenFilter : ITokenFilter
 public sealed partial class RemoveDuplicatesTokenFilterDescriptor : SerializableDescriptor<RemoveDuplicatesTokenFilterDescriptor>, IBuildableDescriptor<RemoveDuplicatesTokenFilter>
 {
 	internal RemoveDuplicatesTokenFilterDescriptor(Action<RemoveDuplicatesTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public RemoveDuplicatesTokenFilterDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ReverseTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ReverseTokenFilter.g.cs
index 242c2851b09..4c538b31407 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ReverseTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ReverseTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class ReverseTokenFilter : ITokenFilter
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "reverse";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class ReverseTokenFilter : ITokenFilter
 public sealed partial class ReverseTokenFilterDescriptor : SerializableDescriptor<ReverseTokenFilterDescriptor>, IBuildableDescriptor<ReverseTokenFilter>
 {
 	internal ReverseTokenFilterDescriptor(Action<ReverseTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public ReverseTokenFilterDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ShingleTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ShingleTokenFilter.g.cs
index f4f3edc798c..f1488aa4fb1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ShingleTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/ShingleTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class ShingleTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("filler_token")]
 	public string? FillerToken { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_shingle_size")]
 	public Union<int?, string?>? MaxShingleSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_shingle_size")]
 	public Union<int?, string?>? MinShingleSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("output_unigrams")]
 	public bool? OutputUnigrams { get; set; }
-
 	[JsonInclude, JsonPropertyName("output_unigrams_if_no_shingles")]
 	public bool? OutputUnigramsIfNoShingles { get; set; }
-
 	[JsonInclude, JsonPropertyName("token_separator")]
 	public string? TokenSeparator { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "shingle";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -55,22 +52,17 @@ public sealed partial class ShingleTokenFilter : ITokenFilter
 public sealed partial class ShingleTokenFilterDescriptor : SerializableDescriptor<ShingleTokenFilterDescriptor>, IBuildableDescriptor<ShingleTokenFilter>
 {
 	internal ShingleTokenFilterDescriptor(Action<ShingleTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public ShingleTokenFilterDescriptor() : base()
 	{
 	}
 
 	private string? FillerTokenValue { get; set; }
-
 	private Union<int?, string?>? MaxShingleSizeValue { get; set; }
-
 	private Union<int?, string?>? MinShingleSizeValue { get; set; }
-
 	private bool? OutputUnigramsValue { get; set; }
-
 	private bool? OutputUnigramsIfNoShinglesValue { get; set; }
-
 	private string? TokenSeparatorValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public ShingleTokenFilterDescriptor FillerToken(string? fillerToken)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SimpleAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SimpleAnalyzer.g.cs
index 56c334880d4..0857fa7486c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SimpleAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SimpleAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class SimpleAnalyzer : IAnalyzer
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "simple";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class SimpleAnalyzer : IAnalyzer
 public sealed partial class SimpleAnalyzerDescriptor : SerializableDescriptor<SimpleAnalyzerDescriptor>, IBuildableDescriptor<SimpleAnalyzer>
 {
 	internal SimpleAnalyzerDescriptor(Action<SimpleAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public SimpleAnalyzerDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SnowballAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SnowballAnalyzer.g.cs
index 2aad7ab14e3..a9f9d85d43e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SnowballAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SnowballAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,20 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class SnowballAnalyzer : IAnalyzer
 {
 	[JsonInclude, JsonPropertyName("language")]
 	public Elastic.Clients.Elasticsearch.Analysis.SnowballLanguage Language { get; set; }
-
 	[JsonInclude, JsonPropertyName("stopwords")]
 	[JsonConverter(typeof(StopWordsConverter))]
 	public ICollection<string>? Stopwords { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "snowball";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -44,14 +45,13 @@ public sealed partial class SnowballAnalyzer : IAnalyzer
 public sealed partial class SnowballAnalyzerDescriptor : SerializableDescriptor<SnowballAnalyzerDescriptor>, IBuildableDescriptor<SnowballAnalyzer>
 {
 	internal SnowballAnalyzerDescriptor(Action<SnowballAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public SnowballAnalyzerDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.SnowballLanguage LanguageValue { get; set; }
-
 	private ICollection<string>? StopwordsValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public SnowballAnalyzerDescriptor Language(Elastic.Clients.Elasticsearch.Analysis.SnowballLanguage language)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SnowballTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SnowballTokenFilter.g.cs
index 97545cbf5f7..f3e0d8125e7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SnowballTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SnowballTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class SnowballTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("language")]
 	public Elastic.Clients.Elasticsearch.Analysis.SnowballLanguage Language { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "snowball";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class SnowballTokenFilter : ITokenFilter
 public sealed partial class SnowballTokenFilterDescriptor : SerializableDescriptor<SnowballTokenFilterDescriptor>, IBuildableDescriptor<SnowballTokenFilter>
 {
 	internal SnowballTokenFilterDescriptor(Action<SnowballTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public SnowballTokenFilterDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.SnowballLanguage LanguageValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public SnowballTokenFilterDescriptor Language(Elastic.Clients.Elasticsearch.Analysis.SnowballLanguage language)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StandardAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StandardAnalyzer.g.cs
index 702ef529cc5..863dbf79c91 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StandardAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StandardAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,29 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class StandardAnalyzer : IAnalyzer
 {
 	[JsonInclude, JsonPropertyName("max_token_length")]
 	public int? MaxTokenLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("stopwords")]
 	[JsonConverter(typeof(StopWordsConverter))]
 	public ICollection<string>? Stopwords { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "standard";
 }
 
 public sealed partial class StandardAnalyzerDescriptor : SerializableDescriptor<StandardAnalyzerDescriptor>, IBuildableDescriptor<StandardAnalyzer>
 {
 	internal StandardAnalyzerDescriptor(Action<StandardAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public StandardAnalyzerDescriptor() : base()
 	{
 	}
 
 	private int? MaxTokenLengthValue { get; set; }
-
 	private ICollection<string>? StopwordsValue { get; set; }
 
 	public StandardAnalyzerDescriptor MaxTokenLength(int? maxTokenLength)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StandardTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StandardTokenizer.g.cs
index ad74d7d80d9..87341d22ee4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StandardTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StandardTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class StandardTokenizer : ITokenizer
 {
 	[JsonInclude, JsonPropertyName("max_token_length")]
 	public int? MaxTokenLength { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "standard";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class StandardTokenizer : ITokenizer
 public sealed partial class StandardTokenizerDescriptor : SerializableDescriptor<StandardTokenizerDescriptor>, IBuildableDescriptor<StandardTokenizer>
 {
 	internal StandardTokenizerDescriptor(Action<StandardTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public StandardTokenizerDescriptor() : base()
 	{
 	}
 
 	private int? MaxTokenLengthValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public StandardTokenizerDescriptor MaxTokenLength(int? maxTokenLength)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StemmerOverrideTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StemmerOverrideTokenFilter.g.cs
index 1a84c2d484a..009b388f58e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StemmerOverrideTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StemmerOverrideTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class StemmerOverrideTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("rules")]
 	public ICollection<string>? Rules { get; set; }
-
 	[JsonInclude, JsonPropertyName("rules_path")]
 	public string? RulesPath { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "stemmer_override";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -43,14 +44,13 @@ public sealed partial class StemmerOverrideTokenFilter : ITokenFilter
 public sealed partial class StemmerOverrideTokenFilterDescriptor : SerializableDescriptor<StemmerOverrideTokenFilterDescriptor>, IBuildableDescriptor<StemmerOverrideTokenFilter>
 {
 	internal StemmerOverrideTokenFilterDescriptor(Action<StemmerOverrideTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public StemmerOverrideTokenFilterDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? RulesValue { get; set; }
-
 	private string? RulesPathValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public StemmerOverrideTokenFilterDescriptor Rules(ICollection<string>? rules)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StemmerTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StemmerTokenFilter.g.cs
index dbd2023e523..5553eda8ca4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StemmerTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StemmerTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class StemmerTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("language")]
 	public string Language { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "stemmer";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class StemmerTokenFilter : ITokenFilter
 public sealed partial class StemmerTokenFilterDescriptor : SerializableDescriptor<StemmerTokenFilterDescriptor>, IBuildableDescriptor<StemmerTokenFilter>
 {
 	internal StemmerTokenFilterDescriptor(Action<StemmerTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public StemmerTokenFilterDescriptor() : base()
 	{
 	}
 
 	private string LanguageValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public StemmerTokenFilterDescriptor Language(string language)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopAnalyzer.g.cs
index f4252cbfc61..fbfbee35b59 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,20 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class StopAnalyzer : IAnalyzer
 {
 	[JsonInclude, JsonPropertyName("stopwords")]
 	[JsonConverter(typeof(StopWordsConverter))]
 	public ICollection<string>? Stopwords { get; set; }
-
 	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "stop";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -44,14 +45,13 @@ public sealed partial class StopAnalyzer : IAnalyzer
 public sealed partial class StopAnalyzerDescriptor : SerializableDescriptor<StopAnalyzerDescriptor>, IBuildableDescriptor<StopAnalyzer>
 {
 	internal StopAnalyzerDescriptor(Action<StopAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public StopAnalyzerDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? StopwordsValue { get; set; }
-
 	private string? StopwordsPathValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public StopAnalyzerDescriptor Stopwords(ICollection<string>? stopwords)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopTokenFilter.g.cs
index c6cc6a0acfb..7107419568b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/StopTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,26 +25,23 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class StopTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("ignore_case")]
 	public bool? IgnoreCase { get; set; }
-
 	[JsonInclude, JsonPropertyName("remove_trailing")]
 	public bool? RemoveTrailing { get; set; }
-
 	[JsonInclude, JsonPropertyName("stopwords")]
 	[JsonConverter(typeof(StopWordsConverter))]
 	public ICollection<string>? Stopwords { get; set; }
-
 	[JsonInclude, JsonPropertyName("stopwords_path")]
 	public string? StopwordsPath { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "stop";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -50,18 +49,15 @@ public sealed partial class StopTokenFilter : ITokenFilter
 public sealed partial class StopTokenFilterDescriptor : SerializableDescriptor<StopTokenFilterDescriptor>, IBuildableDescriptor<StopTokenFilter>
 {
 	internal StopTokenFilterDescriptor(Action<StopTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public StopTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool? IgnoreCaseValue { get; set; }
-
 	private bool? RemoveTrailingValue { get; set; }
-
 	private ICollection<string>? StopwordsValue { get; set; }
-
 	private string? StopwordsPathValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public StopTokenFilterDescriptor IgnoreCase(bool? ignoreCase = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SynonymGraphTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SynonymGraphTokenFilter.g.cs
index 908aec83f76..037736ce58d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SynonymGraphTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SynonymGraphTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class SynonymGraphTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("expand")]
 	public bool? Expand { get; set; }
-
 	[JsonInclude, JsonPropertyName("format")]
 	public Elastic.Clients.Elasticsearch.Analysis.SynonymFormat? Format { get; set; }
-
 	[JsonInclude, JsonPropertyName("lenient")]
 	public bool? Lenient { get; set; }
-
 	[JsonInclude, JsonPropertyName("synonyms")]
 	public ICollection<string>? Synonyms { get; set; }
-
 	[JsonInclude, JsonPropertyName("synonyms_path")]
 	public string? SynonymsPath { get; set; }
-
 	[JsonInclude, JsonPropertyName("tokenizer")]
 	public string? Tokenizer { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "synonym_graph";
+
 	[JsonInclude, JsonPropertyName("updateable")]
 	public bool? Updateable { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -58,24 +54,18 @@ public sealed partial class SynonymGraphTokenFilter : ITokenFilter
 public sealed partial class SynonymGraphTokenFilterDescriptor : SerializableDescriptor<SynonymGraphTokenFilterDescriptor>, IBuildableDescriptor<SynonymGraphTokenFilter>
 {
 	internal SynonymGraphTokenFilterDescriptor(Action<SynonymGraphTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public SynonymGraphTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool? ExpandValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.SynonymFormat? FormatValue { get; set; }
-
 	private bool? LenientValue { get; set; }
-
 	private ICollection<string>? SynonymsValue { get; set; }
-
 	private string? SynonymsPathValue { get; set; }
-
 	private string? TokenizerValue { get; set; }
-
 	private bool? UpdateableValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public SynonymGraphTokenFilterDescriptor Expand(bool? expand = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SynonymTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SynonymTokenFilter.g.cs
index 8ecea884dd4..5639db9e508 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SynonymTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/SynonymTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class SynonymTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("expand")]
 	public bool? Expand { get; set; }
-
 	[JsonInclude, JsonPropertyName("format")]
 	public Elastic.Clients.Elasticsearch.Analysis.SynonymFormat? Format { get; set; }
-
 	[JsonInclude, JsonPropertyName("lenient")]
 	public bool? Lenient { get; set; }
-
 	[JsonInclude, JsonPropertyName("synonyms")]
 	public ICollection<string>? Synonyms { get; set; }
-
 	[JsonInclude, JsonPropertyName("synonyms_path")]
 	public string? SynonymsPath { get; set; }
-
 	[JsonInclude, JsonPropertyName("tokenizer")]
 	public string? Tokenizer { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "synonym";
+
 	[JsonInclude, JsonPropertyName("updateable")]
 	public bool? Updateable { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -58,24 +54,18 @@ public sealed partial class SynonymTokenFilter : ITokenFilter
 public sealed partial class SynonymTokenFilterDescriptor : SerializableDescriptor<SynonymTokenFilterDescriptor>, IBuildableDescriptor<SynonymTokenFilter>
 {
 	internal SynonymTokenFilterDescriptor(Action<SynonymTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public SynonymTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool? ExpandValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.SynonymFormat? FormatValue { get; set; }
-
 	private bool? LenientValue { get; set; }
-
 	private ICollection<string>? SynonymsValue { get; set; }
-
 	private string? SynonymsPathValue { get; set; }
-
 	private string? TokenizerValue { get; set; }
-
 	private bool? UpdateableValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public SynonymTokenFilterDescriptor Expand(bool? expand = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TokenFilters.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TokenFilters.g.cs
index 079dc32749e..f9eea4ada82 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TokenFilters.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TokenFilters.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public partial class TokenFilters : IsADictionary<string, ITokenFilter>
 {
 	public TokenFilters()
@@ -40,8 +42,8 @@ public TokenFilters(IDictionary<string, ITokenFilter> container) : base(containe
 
 	public void Add(string name, ITokenFilter tokenFilter) => BackingDictionary.Add(Sanitize(name), tokenFilter);
 	public bool TryGetTokenFilter(string name, [NotNullWhen(returnValue: true)] out ITokenFilter tokenFilter) => BackingDictionary.TryGetValue(Sanitize(name), out tokenFilter);
-	public bool TryGetTokenFilter<T>(string name, [NotNullWhen(returnValue: true)] out T? tokenFilter)
-		where T : class, ITokenFilter
+
+	public bool TryGetTokenFilter<T>(string name, [NotNullWhen(returnValue: true)] out T? tokenFilter) where T : class, ITokenFilter
 	{
 		if (BackingDictionary.TryGetValue(Sanitize(name), out var matchedValue) && matchedValue is T finalValue)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Tokenizers.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Tokenizers.g.cs
index 70bb2760c89..5a34f298d3e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Tokenizers.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/Tokenizers.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public partial class Tokenizers : IsADictionary<string, ITokenizer>
 {
 	public Tokenizers()
@@ -40,8 +42,8 @@ public Tokenizers(IDictionary<string, ITokenizer> container) : base(container)
 
 	public void Add(string name, ITokenizer tokenizer) => BackingDictionary.Add(Sanitize(name), tokenizer);
 	public bool TryGetTokenizer(string name, [NotNullWhen(returnValue: true)] out ITokenizer tokenizer) => BackingDictionary.TryGetValue(Sanitize(name), out tokenizer);
-	public bool TryGetTokenizer<T>(string name, [NotNullWhen(returnValue: true)] out T? tokenizer)
-		where T : class, ITokenizer
+
+	public bool TryGetTokenizer<T>(string name, [NotNullWhen(returnValue: true)] out T? tokenizer) where T : class, ITokenizer
 	{
 		if (BackingDictionary.TryGetValue(Sanitize(name), out var matchedValue) && matchedValue is T finalValue)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TrimTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TrimTokenFilter.g.cs
index 52fdbbf9b7b..e1066d5241f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TrimTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TrimTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class TrimTokenFilter : ITokenFilter
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "trim";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class TrimTokenFilter : ITokenFilter
 public sealed partial class TrimTokenFilterDescriptor : SerializableDescriptor<TrimTokenFilterDescriptor>, IBuildableDescriptor<TrimTokenFilter>
 {
 	internal TrimTokenFilterDescriptor(Action<TrimTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public TrimTokenFilterDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TruncateTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TruncateTokenFilter.g.cs
index 17d6be0e608..b91335e93f4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TruncateTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/TruncateTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class TruncateTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("length")]
 	public int? Length { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "truncate";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class TruncateTokenFilter : ITokenFilter
 public sealed partial class TruncateTokenFilterDescriptor : SerializableDescriptor<TruncateTokenFilterDescriptor>, IBuildableDescriptor<TruncateTokenFilter>
 {
 	internal TruncateTokenFilterDescriptor(Action<TruncateTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public TruncateTokenFilterDescriptor() : base()
 	{
 	}
 
 	private int? LengthValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public TruncateTokenFilterDescriptor Length(int? length)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UaxEmailUrlTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UaxEmailUrlTokenizer.g.cs
index 1ba0129df94..c6a76716b56 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UaxEmailUrlTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UaxEmailUrlTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class UaxEmailUrlTokenizer : ITokenizer
 {
 	[JsonInclude, JsonPropertyName("max_token_length")]
 	public int? MaxTokenLength { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "uax_url_email";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class UaxEmailUrlTokenizer : ITokenizer
 public sealed partial class UaxEmailUrlTokenizerDescriptor : SerializableDescriptor<UaxEmailUrlTokenizerDescriptor>, IBuildableDescriptor<UaxEmailUrlTokenizer>
 {
 	internal UaxEmailUrlTokenizerDescriptor(Action<UaxEmailUrlTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public UaxEmailUrlTokenizerDescriptor() : base()
 	{
 	}
 
 	private int? MaxTokenLengthValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public UaxEmailUrlTokenizerDescriptor MaxTokenLength(int? maxTokenLength)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UniqueTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UniqueTokenFilter.g.cs
index 887cd9788c7..a41a21b947a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UniqueTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UniqueTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class UniqueTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("only_on_same_position")]
 	public bool? OnlyOnSamePosition { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "unique";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class UniqueTokenFilter : ITokenFilter
 public sealed partial class UniqueTokenFilterDescriptor : SerializableDescriptor<UniqueTokenFilterDescriptor>, IBuildableDescriptor<UniqueTokenFilter>
 {
 	internal UniqueTokenFilterDescriptor(Action<UniqueTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public UniqueTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool? OnlyOnSamePositionValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public UniqueTokenFilterDescriptor OnlyOnSamePosition(bool? onlyOnSamePosition = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UppercaseTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UppercaseTokenFilter.g.cs
index 379e6e590e3..6fe4c2fb1ef 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UppercaseTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/UppercaseTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class UppercaseTokenFilter : ITokenFilter
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "uppercase";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class UppercaseTokenFilter : ITokenFilter
 public sealed partial class UppercaseTokenFilterDescriptor : SerializableDescriptor<UppercaseTokenFilterDescriptor>, IBuildableDescriptor<UppercaseTokenFilter>
 {
 	internal UppercaseTokenFilterDescriptor(Action<UppercaseTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public UppercaseTokenFilterDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WhitespaceAnalyzer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WhitespaceAnalyzer.g.cs
index 2f7b7943573..2015785b04b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WhitespaceAnalyzer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WhitespaceAnalyzer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class WhitespaceAnalyzer : IAnalyzer
 {
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "whitespace";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -37,6 +39,7 @@ public sealed partial class WhitespaceAnalyzer : IAnalyzer
 public sealed partial class WhitespaceAnalyzerDescriptor : SerializableDescriptor<WhitespaceAnalyzerDescriptor>, IBuildableDescriptor<WhitespaceAnalyzer>
 {
 	internal WhitespaceAnalyzerDescriptor(Action<WhitespaceAnalyzerDescriptor> configure) => configure.Invoke(this);
+
 	public WhitespaceAnalyzerDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WhitespaceTokenizer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WhitespaceTokenizer.g.cs
index dbdcc1892de..29ded0ca48a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WhitespaceTokenizer.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WhitespaceTokenizer.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class WhitespaceTokenizer : ITokenizer
 {
 	[JsonInclude, JsonPropertyName("max_token_length")]
 	public int? MaxTokenLength { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "whitespace";
+
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -40,12 +42,12 @@ public sealed partial class WhitespaceTokenizer : ITokenizer
 public sealed partial class WhitespaceTokenizerDescriptor : SerializableDescriptor<WhitespaceTokenizerDescriptor>, IBuildableDescriptor<WhitespaceTokenizer>
 {
 	internal WhitespaceTokenizerDescriptor(Action<WhitespaceTokenizerDescriptor> configure) => configure.Invoke(this);
+
 	public WhitespaceTokenizerDescriptor() : base()
 	{
 	}
 
 	private int? MaxTokenLengthValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public WhitespaceTokenizerDescriptor MaxTokenLength(int? maxTokenLength)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WordDelimiterGraphTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WordDelimiterGraphTokenFilter.g.cs
index b6c466dcd1e..01e847bb2aa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WordDelimiterGraphTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WordDelimiterGraphTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,58 +25,44 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class WordDelimiterGraphTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("adjust_offsets")]
 	public bool? AdjustOffsets { get; set; }
-
 	[JsonInclude, JsonPropertyName("catenate_all")]
 	public bool? CatenateAll { get; set; }
-
 	[JsonInclude, JsonPropertyName("catenate_numbers")]
 	public bool? CatenateNumbers { get; set; }
-
 	[JsonInclude, JsonPropertyName("catenate_words")]
 	public bool? CatenateWords { get; set; }
-
 	[JsonInclude, JsonPropertyName("generate_number_parts")]
 	public bool? GenerateNumberParts { get; set; }
-
 	[JsonInclude, JsonPropertyName("generate_word_parts")]
 	public bool? GenerateWordParts { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_keywords")]
 	public bool? IgnoreKeywords { get; set; }
-
 	[JsonInclude, JsonPropertyName("preserve_original")]
 	public bool? PreserveOriginal { get; set; }
-
 	[JsonInclude, JsonPropertyName("protected_words")]
 	public ICollection<string>? ProtectedWords { get; set; }
-
 	[JsonInclude, JsonPropertyName("protected_words_path")]
 	public string? ProtectedWordsPath { get; set; }
-
 	[JsonInclude, JsonPropertyName("split_on_case_change")]
 	public bool? SplitOnCaseChange { get; set; }
-
 	[JsonInclude, JsonPropertyName("split_on_numerics")]
 	public bool? SplitOnNumerics { get; set; }
-
 	[JsonInclude, JsonPropertyName("stem_english_possessive")]
 	public bool? StemEnglishPossessive { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "word_delimiter_graph";
+
 	[JsonInclude, JsonPropertyName("type_table")]
 	public ICollection<string>? TypeTable { get; set; }
-
 	[JsonInclude, JsonPropertyName("type_table_path")]
 	public string? TypeTablePath { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -82,40 +70,26 @@ public sealed partial class WordDelimiterGraphTokenFilter : ITokenFilter
 public sealed partial class WordDelimiterGraphTokenFilterDescriptor : SerializableDescriptor<WordDelimiterGraphTokenFilterDescriptor>, IBuildableDescriptor<WordDelimiterGraphTokenFilter>
 {
 	internal WordDelimiterGraphTokenFilterDescriptor(Action<WordDelimiterGraphTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public WordDelimiterGraphTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool? AdjustOffsetsValue { get; set; }
-
 	private bool? CatenateAllValue { get; set; }
-
 	private bool? CatenateNumbersValue { get; set; }
-
 	private bool? CatenateWordsValue { get; set; }
-
 	private bool? GenerateNumberPartsValue { get; set; }
-
 	private bool? GenerateWordPartsValue { get; set; }
-
 	private bool? IgnoreKeywordsValue { get; set; }
-
 	private bool? PreserveOriginalValue { get; set; }
-
 	private ICollection<string>? ProtectedWordsValue { get; set; }
-
 	private string? ProtectedWordsPathValue { get; set; }
-
 	private bool? SplitOnCaseChangeValue { get; set; }
-
 	private bool? SplitOnNumericsValue { get; set; }
-
 	private bool? StemEnglishPossessiveValue { get; set; }
-
 	private ICollection<string>? TypeTableValue { get; set; }
-
 	private string? TypeTablePathValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public WordDelimiterGraphTokenFilterDescriptor AdjustOffsets(bool? adjustOffsets = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WordDelimiterTokenFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WordDelimiterTokenFilter.g.cs
index 4f04dee859b..a4c3a421beb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WordDelimiterTokenFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Analysis/WordDelimiterTokenFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,52 +25,40 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 public sealed partial class WordDelimiterTokenFilter : ITokenFilter
 {
 	[JsonInclude, JsonPropertyName("catenate_all")]
 	public bool? CatenateAll { get; set; }
-
 	[JsonInclude, JsonPropertyName("catenate_numbers")]
 	public bool? CatenateNumbers { get; set; }
-
 	[JsonInclude, JsonPropertyName("catenate_words")]
 	public bool? CatenateWords { get; set; }
-
 	[JsonInclude, JsonPropertyName("generate_number_parts")]
 	public bool? GenerateNumberParts { get; set; }
-
 	[JsonInclude, JsonPropertyName("generate_word_parts")]
 	public bool? GenerateWordParts { get; set; }
-
 	[JsonInclude, JsonPropertyName("preserve_original")]
 	public bool? PreserveOriginal { get; set; }
-
 	[JsonInclude, JsonPropertyName("protected_words")]
 	public ICollection<string>? ProtectedWords { get; set; }
-
 	[JsonInclude, JsonPropertyName("protected_words_path")]
 	public string? ProtectedWordsPath { get; set; }
-
 	[JsonInclude, JsonPropertyName("split_on_case_change")]
 	public bool? SplitOnCaseChange { get; set; }
-
 	[JsonInclude, JsonPropertyName("split_on_numerics")]
 	public bool? SplitOnNumerics { get; set; }
-
 	[JsonInclude, JsonPropertyName("stem_english_possessive")]
 	public bool? StemEnglishPossessive { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "word_delimiter";
+
 	[JsonInclude, JsonPropertyName("type_table")]
 	public ICollection<string>? TypeTable { get; set; }
-
 	[JsonInclude, JsonPropertyName("type_table_path")]
 	public string? TypeTablePath { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public string? Version { get; set; }
 }
@@ -76,36 +66,24 @@ public sealed partial class WordDelimiterTokenFilter : ITokenFilter
 public sealed partial class WordDelimiterTokenFilterDescriptor : SerializableDescriptor<WordDelimiterTokenFilterDescriptor>, IBuildableDescriptor<WordDelimiterTokenFilter>
 {
 	internal WordDelimiterTokenFilterDescriptor(Action<WordDelimiterTokenFilterDescriptor> configure) => configure.Invoke(this);
+
 	public WordDelimiterTokenFilterDescriptor() : base()
 	{
 	}
 
 	private bool? CatenateAllValue { get; set; }
-
 	private bool? CatenateNumbersValue { get; set; }
-
 	private bool? CatenateWordsValue { get; set; }
-
 	private bool? GenerateNumberPartsValue { get; set; }
-
 	private bool? GenerateWordPartsValue { get; set; }
-
 	private bool? PreserveOriginalValue { get; set; }
-
 	private ICollection<string>? ProtectedWordsValue { get; set; }
-
 	private string? ProtectedWordsPathValue { get; set; }
-
 	private bool? SplitOnCaseChangeValue { get; set; }
-
 	private bool? SplitOnNumericsValue { get; set; }
-
 	private bool? StemEnglishPossessiveValue { get; set; }
-
 	private ICollection<string>? TypeTableValue { get; set; }
-
 	private string? TypeTablePathValue { get; set; }
-
 	private string? VersionValue { get; set; }
 
 	public WordDelimiterTokenFilterDescriptor CatenateAll(bool? catenateAll = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/AsyncSearch/AsyncSearch.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/AsyncSearch/AsyncSearch.g.cs
index a5a204e9965..54199bd56a8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/AsyncSearch/AsyncSearch.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/AsyncSearch/AsyncSearch.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,46 +25,34 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.AsyncSearch;
+
 public sealed partial class AsyncSearch<TDocument>
 {
 	[JsonInclude, JsonPropertyName("_clusters")]
 	public Elastic.Clients.Elasticsearch.ClusterStatistics? Clusters { get; init; }
-
 	[JsonInclude, JsonPropertyName("_scroll_id")]
 	public Elastic.Clients.Elasticsearch.ScrollId? ScrollId { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary? Aggregations { get; init; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<TDocument> HitsMetadata { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_score")]
 	public double? MaxScore { get; init; }
-
 	[JsonInclude, JsonPropertyName("num_reduce_phases")]
 	public long? NumReducePhases { get; init; }
-
 	[JsonInclude, JsonPropertyName("pit_id")]
 	public string? PitId { get; init; }
-
 	[JsonInclude, JsonPropertyName("profile")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Profile? Profile { get; init; }
-
 	[JsonInclude, JsonPropertyName("terminated_early")]
 	public bool? TerminatedEarly { get; init; }
-
 	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool TimedOut { get; init; }
-
 	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkIndexByScrollFailure.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkIndexByScrollFailure.g.cs
index 249e674c9df..2008b28414e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkIndexByScrollFailure.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkIndexByScrollFailure.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class BulkIndexByScrollFailure
 {
 	[JsonInclude, JsonPropertyName("cause")]
 	public Elastic.Clients.Elasticsearch.ErrorCause Cause { get; init; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public int Status { get; init; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkStats.g.cs
index 5452986526e..32e39a80b86 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/BulkStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class BulkStats
 {
 	[JsonInclude, JsonPropertyName("avg_size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? AvgSize { get; init; }
-
 	[JsonInclude, JsonPropertyName("avg_size_in_bytes")]
 	public long AvgSizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("avg_time")]
 	public Elastic.Clients.Elasticsearch.Duration? AvgTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("avg_time_in_millis")]
 	public long AvgTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_operations")]
 	public long TotalOperations { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? TotalSize { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_size_in_bytes")]
 	public long TotalSizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_time")]
 	public Elastic.Clients.Elasticsearch.Duration? TotalTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_time_in_millis")]
 	public long TotalTimeInMillis { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ByteSize.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ByteSize.g.cs
index 31c1ee935a3..dd80e84263d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ByteSize.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ByteSize.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ByteSize : Union<long, string>
 {
 	public ByteSize(long byteSize) : base(byteSize)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/IndexHealthStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/IndexHealthStats.g.cs
index 90e60d04753..6d4369248d8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/IndexHealthStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/IndexHealthStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Cluster;
+
 public sealed partial class IndexHealthStats
 {
 	[JsonInclude, JsonPropertyName("active_primary_shards")]
 	public int ActivePrimaryShards { get; init; }
-
 	[JsonInclude, JsonPropertyName("active_shards")]
 	public int ActiveShards { get; init; }
-
 	[JsonInclude, JsonPropertyName("initializing_shards")]
 	public int InitializingShards { get; init; }
-
 	[JsonInclude, JsonPropertyName("number_of_replicas")]
 	public int NumberOfReplicas { get; init; }
-
 	[JsonInclude, JsonPropertyName("number_of_shards")]
 	public int NumberOfShards { get; init; }
-
 	[JsonInclude, JsonPropertyName("relocating_shards")]
 	public int RelocatingShards { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Cluster.ShardHealthStats>? Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.HealthStatus Status { get; init; }
-
 	[JsonInclude, JsonPropertyName("unassigned_shards")]
 	public int UnassignedShards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ShardHealthStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ShardHealthStats.g.cs
index a6aff37fb02..62534fff30d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ShardHealthStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/ShardHealthStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Cluster;
+
 public sealed partial class ShardHealthStats
 {
 	[JsonInclude, JsonPropertyName("active_shards")]
 	public int ActiveShards { get; init; }
-
 	[JsonInclude, JsonPropertyName("initializing_shards")]
 	public int InitializingShards { get; init; }
-
 	[JsonInclude, JsonPropertyName("primary_active")]
 	public bool PrimaryActive { get; init; }
-
 	[JsonInclude, JsonPropertyName("relocating_shards")]
 	public int RelocatingShards { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.HealthStatus Status { get; init; }
-
 	[JsonInclude, JsonPropertyName("unassigned_shards")]
 	public int UnassignedShards { 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 d88da3e8c86..c1d0275160e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/UnassignedInformation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Cluster/UnassignedInformation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Cluster;
+
 public sealed partial class UnassignedInformation
 {
 	[JsonInclude, JsonPropertyName("allocation_status")]
 	public string? AllocationStatus { get; init; }
-
 	[JsonInclude, JsonPropertyName("at")]
 	public DateTimeOffset At { get; init; }
-
 	[JsonInclude, JsonPropertyName("delayed")]
 	public bool? Delayed { get; init; }
-
 	[JsonInclude, JsonPropertyName("details")]
 	public string? Details { get; init; }
-
 	[JsonInclude, JsonPropertyName("failed_allocation_attempts")]
 	public int? FailedAllocationAttempts { get; init; }
-
 	[JsonInclude, JsonPropertyName("last_allocation_status")]
 	public string? LastAllocationStatus { get; init; }
-
 	[JsonInclude, JsonPropertyName("reason")]
 	public Elastic.Clients.Elasticsearch.Cluster.UnassignedInformationReason Reason { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ClusterStatistics.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ClusterStatistics.g.cs
index 70ebfec492a..a1fea4f7973 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ClusterStatistics.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ClusterStatistics.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ClusterStatistics
 {
 	[JsonInclude, JsonPropertyName("skipped")]
 	public int Skipped { get; init; }
-
 	[JsonInclude, JsonPropertyName("successful")]
 	public int Successful { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public int Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/CompletionStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/CompletionStats.g.cs
index f69e48855c6..2bbb9b14ff5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/CompletionStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/CompletionStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,17 +25,15 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class CompletionStats
 {
 	[JsonInclude, JsonPropertyName("fields")]
 	[ReadOnlyFieldDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.FieldSizeUsage))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.FieldSizeUsage>? Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? Size { get; init; }
-
 	[JsonInclude, JsonPropertyName("size_in_bytes")]
 	public long SizeInBytes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/CoordsGeoBounds.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/CoordsGeoBounds.g.cs
index 2635aacb1a4..5c33a21f098 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/CoordsGeoBounds.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/CoordsGeoBounds.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class CoordsGeoBounds
 {
 	[JsonInclude, JsonPropertyName("bottom")]
 	public double Bottom { get; set; }
-
 	[JsonInclude, JsonPropertyName("left")]
 	public double Left { get; set; }
-
 	[JsonInclude, JsonPropertyName("right")]
 	public double Right { get; set; }
-
 	[JsonInclude, JsonPropertyName("top")]
 	public double Top { get; set; }
 }
@@ -43,16 +42,14 @@ public sealed partial class CoordsGeoBounds
 public sealed partial class CoordsGeoBoundsDescriptor : SerializableDescriptor<CoordsGeoBoundsDescriptor>
 {
 	internal CoordsGeoBoundsDescriptor(Action<CoordsGeoBoundsDescriptor> configure) => configure.Invoke(this);
+
 	public CoordsGeoBoundsDescriptor() : base()
 	{
 	}
 
 	private double BottomValue { get; set; }
-
 	private double LeftValue { get; set; }
-
 	private double RightValue { get; set; }
-
 	private double TopValue { get; set; }
 
 	public CoordsGeoBoundsDescriptor Bottom(double bottom)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Bulk/ResponseItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Bulk/ResponseItem.g.cs
index 0a9e60c3c1f..185121c19ea 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Bulk/ResponseItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Bulk/ResponseItem.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
@@ -24,40 +26,30 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Bulk;
+
 public abstract partial class ResponseItem
 {
 	[JsonInclude, JsonPropertyName("_id")]
 	public string? Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("_primary_term")]
 	public long? PrimaryTerm { get; init; }
-
 	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long? SeqNo { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics? Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("_version")]
 	public long? Version { get; init; }
-
 	[JsonInclude, JsonPropertyName("error")]
 	public Elastic.Clients.Elasticsearch.ErrorCause? Error { get; init; }
-
 	[JsonInclude, JsonPropertyName("forced_refresh")]
 	public bool? ForcedRefresh { get; init; }
-
 	[JsonInclude, JsonPropertyName("get")]
 	public Elastic.Clients.Elasticsearch.InlineGet<LazyJson>? Get { get; init; }
-
 	[JsonInclude, JsonPropertyName("result")]
 	public string? Result { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public int Status { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Context.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Context.g.cs
index 007314da344..44378f44ce3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Context.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Context.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class Context : Union<string, Elastic.Clients.Elasticsearch.GeoLocation>
 {
 	public Context(string category) : base(category)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Explain/Explanation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Explain/Explanation.g.cs
index a442c65f433..9d4fe3bafbe 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Explain/Explanation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Explain/Explanation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Explain;
+
 public sealed partial class Explanation
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-
 	[JsonInclude, JsonPropertyName("details")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Explain.ExplanationDetail> Details { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public float Value { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Explain/ExplanationDetail.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Explain/ExplanationDetail.g.cs
index 8207e12bc6e..ae9be681fb6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Explain/ExplanationDetail.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Explain/ExplanationDetail.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Explain;
+
 public sealed partial class ExplanationDetail
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-
 	[JsonInclude, JsonPropertyName("details")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Explain.ExplanationDetail>? Details { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public float Value { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/FieldCaps/FieldCapability.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/FieldCaps/FieldCapability.g.cs
index 33ab330f388..e6bf3fddf25 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/FieldCaps/FieldCapability.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/FieldCaps/FieldCapability.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,43 +25,75 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.FieldCaps;
+
 public sealed partial class FieldCapability
 {
+	/// <summary>
+	/// <para>Whether this field can be aggregated on all indices.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("aggregatable")]
 	public bool Aggregatable { get; init; }
 
+	/// <summary>
+	/// <para>The list of indices where this field has the same type family, or null if all indices have the same type family for the field.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Indices? Indices { get; init; }
 
+	/// <summary>
+	/// <para>Merged metadata across all indices as a map of string keys to arrays of values. A value length of 1 indicates that all indices had the same value for this key, while a length of 2 or more indicates that not all indices had the same value for this key.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
 
+	/// <summary>
+	/// <para>Whether this field is registered as a metadata field.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("metadata_field")]
 	public bool? MetadataField { get; init; }
 
+	/// <summary>
+	/// <para>The list of indices where this field is present if these indices<br/>don’t have the same `time_series_metric` value for this field.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("metric_conflicts_indices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexName>? MetricConflictsIndices { get; init; }
 
+	/// <summary>
+	/// <para>The list of indices where this field is not aggregatable, or null if all indices have the same definition for the field.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("non_aggregatable_indices")]
 	public Elastic.Clients.Elasticsearch.Indices? NonAggregatableIndices { get; init; }
 
+	/// <summary>
+	/// <para>If this list is present in response then some indices have the<br/>field marked as a dimension and other indices, the ones in this list, do not.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("non_dimension_indices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexName>? NonDimensionIndices { get; init; }
 
+	/// <summary>
+	/// <para>The list of indices where this field is not searchable, or null if all indices have the same definition for the field.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("non_searchable_indices")]
 	public Elastic.Clients.Elasticsearch.Indices? NonSearchableIndices { get; init; }
 
+	/// <summary>
+	/// <para>Whether this field is indexed for search on all indices.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("searchable")]
 	public bool Searchable { get; init; }
 
+	/// <summary>
+	/// <para>Whether this field is used as a time series dimension.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; init; }
 
+	/// <summary>
+	/// <para>Contains metric type if this fields is used as a time series<br/>metrics, absent if the field is not used as metric.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; init; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Get/GetResult.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Get/GetResult.g.cs
index 122c32f1869..75cc69175b5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Get/GetResult.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Get/GetResult.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,35 +25,27 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Get;
+
 public sealed partial class GetResult<TDocument>
 {
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("_primary_term")]
 	public long? PrimaryTerm { get; init; }
-
 	[JsonInclude, JsonPropertyName("_routing")]
 	public string? Routing { get; init; }
-
 	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long? SeqNo { get; init; }
-
 	[JsonInclude, JsonPropertyName("_source")]
 	[SourceConverter]
 	public TDocument? Source { get; init; }
-
 	[JsonInclude, JsonPropertyName("_version")]
 	public long? Version { get; init; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.FieldValues? Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/Context.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/Context.g.cs
index d2c76cf931e..5a177ddca51 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/Context.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/Context.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.GetScriptContext;
+
 public sealed partial class Context
 {
 	[JsonInclude, JsonPropertyName("methods")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.GetScriptContext.ContextMethod> Methods { get; init; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/ContextMethod.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/ContextMethod.g.cs
index 4ca13208dae..4171d824aa8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/ContextMethod.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/ContextMethod.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.GetScriptContext;
+
 public sealed partial class ContextMethod
 {
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-
 	[JsonInclude, JsonPropertyName("params")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.GetScriptContext.ContextMethodParam> Params { get; init; }
-
 	[JsonInclude, JsonPropertyName("return_type")]
 	public string ReturnType { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/ContextMethodParam.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/ContextMethodParam.g.cs
index 741e1eda3b2..dd3ec8acc19 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/ContextMethodParam.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptContext/ContextMethodParam.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.GetScriptContext;
+
 public sealed partial class ContextMethodParam
 {
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptLanguages/LanguageContext.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptLanguages/LanguageContext.g.cs
index d8709662cb7..0b3a7677132 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptLanguages/LanguageContext.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/GetScriptLanguages/LanguageContext.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.GetScriptLanguages;
+
 public sealed partial class LanguageContext
 {
 	[JsonInclude, JsonPropertyName("contexts")]
 	public IReadOnlyCollection<string> Contexts { get; init; }
-
 	[JsonInclude, JsonPropertyName("language")]
 	public Elastic.Clients.Elasticsearch.ScriptLanguage Language { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/MultiGetError.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/MultiGetError.g.cs
index b463b2e2172..d29b1c04386 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/MultiGetError.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/MultiGetError.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.MGet;
+
 public sealed partial class MultiGetError
 {
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("error")]
 	public Elastic.Clients.Elasticsearch.ErrorCause Error { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/MultiGetOperation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/MultiGetOperation.g.cs
index dd9dc31a7b1..3198a5f83a2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/MultiGetOperation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MGet/MultiGetOperation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,41 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.MGet;
+
 public sealed partial class MultiGetOperation
 {
+	/// <summary>
+	/// <para>The unique document ID.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_id")]
 	public Elastic.Clients.Elasticsearch.Id Id { get; set; }
 
+	/// <summary>
+	/// <para>The index that contains the document.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
 
+	/// <summary>
+	/// <para>If `false`, excludes all _source fields.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
 
+	/// <summary>
+	/// <para>The key for the primary shard the document resides on. Required if routing is used during indexing.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
 
+	/// <summary>
+	/// <para>The stored fields you want to retrieve.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("stored_fields")]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
-
 	[JsonInclude, JsonPropertyName("version_type")]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get; set; }
 }
@@ -52,48 +67,58 @@ public sealed partial class MultiGetOperation
 public sealed partial class MultiGetOperationDescriptor : SerializableDescriptor<MultiGetOperationDescriptor>
 {
 	internal MultiGetOperationDescriptor(Action<MultiGetOperationDescriptor> configure) => configure.Invoke(this);
+
 	public MultiGetOperationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Id IdValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; }
-
 	private long? VersionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.VersionType? VersionTypeValue { get; set; }
 
+	/// <summary>
+	/// <para>The unique document ID.</para>
+	/// </summary>
 	public MultiGetOperationDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		IdValue = id;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The index that contains the document.</para>
+	/// </summary>
 	public MultiGetOperationDescriptor Index(Elastic.Clients.Elasticsearch.IndexName? index)
 	{
 		IndexValue = index;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If `false`, excludes all _source fields.</para>
+	/// </summary>
 	public MultiGetOperationDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source)
 	{
 		SourceValue = source;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The key for the primary shard the document resides on. Required if routing is used during indexing.</para>
+	/// </summary>
 	public MultiGetOperationDescriptor Routing(Elastic.Clients.Elasticsearch.Routing? routing)
 	{
 		RoutingValue = routing;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The stored fields you want to retrieve.</para>
+	/// </summary>
 	public MultiGetOperationDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields)
 	{
 		StoredFieldsValue = storedFields;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultiSearchItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultiSearchItem.g.cs
index 76bd55c2235..5c4d4beda5d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultiSearchItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultiSearchItem.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,49 +25,36 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.MSearch;
+
 public sealed partial class MultiSearchItem<TDocument>
 {
 	[JsonInclude, JsonPropertyName("_clusters")]
 	public Elastic.Clients.Elasticsearch.ClusterStatistics? Clusters { get; init; }
-
 	[JsonInclude, JsonPropertyName("_scroll_id")]
 	public Elastic.Clients.Elasticsearch.ScrollId? ScrollId { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shards")]
 	public Elastic.Clients.Elasticsearch.ShardStatistics Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("aggregations")]
 	public Elastic.Clients.Elasticsearch.Aggregations.AggregateDictionary? Aggregations { get; init; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HitsMetadata<TDocument> HitsMetadata { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_score")]
 	public double? MaxScore { get; init; }
-
 	[JsonInclude, JsonPropertyName("num_reduce_phases")]
 	public long? NumReducePhases { get; init; }
-
 	[JsonInclude, JsonPropertyName("pit_id")]
 	public string? PitId { get; init; }
-
 	[JsonInclude, JsonPropertyName("profile")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Profile? Profile { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public int? Status { get; init; }
-
 	[JsonInclude, JsonPropertyName("terminated_early")]
 	public bool? TerminatedEarly { get; init; }
-
 	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool TimedOut { get; init; }
-
 	[JsonInclude, JsonPropertyName("took")]
 	public long Took { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs
index 48b2e6d9c2f..865dd6a6fff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,97 +25,155 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.MSearch;
+
 public sealed partial class MultisearchBody
 {
+	/// <summary>
+	/// <para>Indicates which source fields are returned for matching documents. These<br/>fields are returned in the hits._source property of the search response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
-
 	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? Collapse { get; set; }
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns doc values for field<br/>names matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("docvalue_fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
 
+	/// <summary>
+	/// <para>If true, returns detailed information about score computation as part of a hit.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
+	/// <summary>
+	/// <para>Configuration of search extensions defined by Elasticsearch plugins.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("ext")]
 	public IDictionary<string, object>? Ext { get; set; }
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns values for field names<br/>matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? Fields { get; set; }
 
+	/// <summary>
+	/// <para>Starting document offset. By default, you cannot page through more than 10,000<br/>hits using the from and size parameters. To page through more hits, use the<br/>search_after parameter.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
-
 	[JsonInclude, JsonPropertyName("highlight")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Highlight? Highlight { get; set; }
 
+	/// <summary>
+	/// <para>Boosts the _score of documents from specified indices.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("indices_boost")]
 	public ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? IndicesBoost { get; set; }
 
+	/// <summary>
+	/// <para>Defines the approximate kNN search to run.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("knn")]
 	public Elastic.Clients.Elasticsearch.KnnQuery? Knn { get; set; }
 
+	/// <summary>
+	/// <para>Minimum _score for matching documents. Documents with a lower _score are<br/>not included in the search results.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("min_score")]
 	public double? MinScore { get; set; }
 
+	/// <summary>
+	/// <para>Limits the search to a point in time (PIT). If you provide a PIT, you<br/>cannot specify an <index> in the request path.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("pit")]
 	public Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? Pit { get; set; }
-
 	[JsonInclude, JsonPropertyName("post_filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilter { get; set; }
-
 	[JsonInclude, JsonPropertyName("profile")]
 	public bool? Profile { get; set; }
 
+	/// <summary>
+	/// <para>Defines the search definition using the Query DSL.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("rescore"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Core.Search.Rescore))]
 	public ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>? Rescore { get; set; }
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappings { get; set; }
 
+	/// <summary>
+	/// <para>Retrieve a script evaluation (based on different fields) for each hit.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_after")]
 	public ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfter { get; set; }
 
+	/// <summary>
+	/// <para>If true, returns sequence number and primary term of the last modification<br/>of each hit. See Optimistic concurrency control.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("seq_no_primary_term")]
 	public bool? SeqNoPrimaryTerm { get; set; }
 
+	/// <summary>
+	/// <para>The number of hits to return. By default, you cannot page through more<br/>than 10,000 hits using the from and size parameters. To page through more<br/>hits, use the search_after parameter.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
-
 	[JsonInclude, JsonPropertyName("sort"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 
+	/// <summary>
+	/// <para>Stats groups to associate with the search. Each group maintains a statistics<br/>aggregation for its associated searches. You can retrieve these stats using<br/>the indices stats API.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("stats")]
 	public ICollection<string>? Stats { get; set; }
 
+	/// <summary>
+	/// <para>List of stored fields to return as part of a hit. If no fields are specified,<br/>no stored fields are included in the response. If this field is specified, the _source<br/>parameter defaults to false. You can pass _source: true to return both source fields<br/>and stored fields in the search response.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("stored_fields")]
 	public Elastic.Clients.Elasticsearch.Fields? StoredFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("suggest")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Suggester? Suggest { get; set; }
 
+	/// <summary>
+	/// <para>Maximum number of documents to collect for each shard. If a query reaches this<br/>limit, Elasticsearch terminates the query early. Elasticsearch collects documents<br/>before sorting. Defaults to 0, which does not terminate query execution early.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("terminate_after")]
 	public long? TerminateAfter { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the period of time to wait for a response from each shard. If no response<br/>is received before the timeout expires, the request fails and returns an error.<br/>Defaults to no timeout.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("timeout")]
 	public string? Timeout { get; set; }
 
+	/// <summary>
+	/// <para>If true, calculate and return document scores, even if the scores are not used for sorting.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("track_scores")]
 	public bool? TrackScores { get; set; }
 
+	/// <summary>
+	/// <para>Number of hits matching the query to count accurately. If true, the exact<br/>number of hits is returned at the cost of some performance. If false, the<br/>response does not include the total number of hits matching the query.<br/>Defaults to 10,000 hits.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("track_total_hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHits { get; set; }
 
+	/// <summary>
+	/// <para>If true, returns document version as part of a hit.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 }
@@ -121,120 +181,66 @@ public sealed partial class MultisearchBody
 public sealed partial class MultisearchBodyDescriptor<TDocument> : SerializableDescriptor<MultisearchBodyDescriptor<TDocument>>
 {
 	internal MultisearchBodyDescriptor(Action<MultisearchBodyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MultisearchBodyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; }
-
 	private Core.Search.FieldCollapseDescriptor<TDocument> CollapseDescriptor { get; set; }
-
 	private Action<Core.Search.FieldCollapseDescriptor<TDocument>> CollapseDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor<TDocument> DocvalueFieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>> DocvalueFieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>>[] DocvalueFieldsDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? FieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor<TDocument> FieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>> FieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>>[] FieldsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Highlight? HighlightValue { get; set; }
-
 	private Core.Search.HighlightDescriptor<TDocument> HighlightDescriptor { get; set; }
-
 	private Action<Core.Search.HighlightDescriptor<TDocument>> HighlightDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }
-
 	private KnnQueryDescriptor<TDocument> KnnDescriptor { get; set; }
-
 	private Action<KnnQueryDescriptor<TDocument>> KnnDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> PostFilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> PostFilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>? RescoreValue { get; set; }
-
 	private Core.Search.RescoreDescriptor<TDocument> RescoreDescriptor { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor<TDocument>> RescoreDescriptorAction { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor<TDocument>>[] RescoreDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor<TDocument> SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private bool? ExplainValue { get; set; }
-
 	private IDictionary<string, object>? ExtValue { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? IndicesBoostValue { get; set; }
-
 	private double? MinScoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? PitValue { get; set; }
-
 	private Core.Search.PointInTimeReferenceDescriptor PitDescriptor { get; set; }
-
 	private Action<Core.Search.PointInTimeReferenceDescriptor> PitDescriptorAction { get; set; }
-
 	private bool? ProfileValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFieldsValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfterValue { get; set; }
-
 	private bool? SeqNoPrimaryTermValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private ICollection<string>? StatsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Suggester? SuggestValue { get; set; }
-
 	private Core.Search.SuggesterDescriptor SuggestDescriptor { get; set; }
-
 	private Action<Core.Search.SuggesterDescriptor> SuggestDescriptorAction { get; set; }
-
 	private long? TerminateAfterValue { get; set; }
-
 	private string? TimeoutValue { get; set; }
-
 	private bool? TrackScoresValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHitsValue { get; set; }
-
 	private bool? VersionValue { get; set; }
 
 	public MultisearchBodyDescriptor<TDocument> Collapse(Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? collapse)
@@ -261,6 +267,9 @@ public MultisearchBodyDescriptor<TDocument> Collapse(Action<Core.Search.FieldCol
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns doc values for field<br/>names matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> DocvalueFields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? docvalueFields)
 	{
 		DocvalueFieldsDescriptor = null;
@@ -297,6 +306,9 @@ public MultisearchBodyDescriptor<TDocument> DocvalueFields(params Action<QueryDs
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns values for field names<br/>matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> Fields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? fields)
 	{
 		FieldsDescriptor = null;
@@ -357,6 +369,9 @@ public MultisearchBodyDescriptor<TDocument> Highlight(Action<Core.Search.Highlig
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the approximate kNN search to run.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
 	{
 		KnnDescriptor = null;
@@ -405,6 +420,9 @@ public MultisearchBodyDescriptor<TDocument> PostFilter(Action<QueryDsl.QueryDesc
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the search definition using the Query DSL.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
 	{
 		QueryDescriptor = null;
@@ -501,42 +519,63 @@ public MultisearchBodyDescriptor<TDocument> Sort(params Action<SortOptionsDescri
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Indicates which source fields are returned for matching documents. These<br/>fields are returned in the hits._source property of the search response.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source)
 	{
 		SourceValue = source;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns detailed information about score computation as part of a hit.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> Explain(bool? explain = true)
 	{
 		ExplainValue = explain;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Configuration of search extensions defined by Elasticsearch plugins.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> Ext(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		ExtValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Starting document offset. By default, you cannot page through more than 10,000<br/>hits using the from and size parameters. To page through more hits, use the<br/>search_after parameter.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> From(int? from)
 	{
 		FromValue = from;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Boosts the _score of documents from specified indices.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> IndicesBoost(ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? indicesBoost)
 	{
 		IndicesBoostValue = indicesBoost;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Minimum _score for matching documents. Documents with a lower _score are<br/>not included in the search results.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> MinScore(double? minScore)
 	{
 		MinScoreValue = minScore;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Limits the search to a point in time (PIT). If you provide a PIT, you<br/>cannot specify an <index> in the request path.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> Pit(Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? pit)
 	{
 		PitDescriptor = null;
@@ -567,12 +606,18 @@ public MultisearchBodyDescriptor<TDocument> Profile(bool? profile = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> RuntimeMappings(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeMappingsValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Retrieve a script evaluation (based on different fields) for each hit.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> ScriptFields(Func<FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>, FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>> selector)
 	{
 		ScriptFieldsValue = selector?.Invoke(new FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>());
@@ -585,24 +630,36 @@ public MultisearchBodyDescriptor<TDocument> SearchAfter(ICollection<Elastic.Clie
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns sequence number and primary term of the last modification<br/>of each hit. See Optimistic concurrency control.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> SeqNoPrimaryTerm(bool? seqNoPrimaryTerm = true)
 	{
 		SeqNoPrimaryTermValue = seqNoPrimaryTerm;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The number of hits to return. By default, you cannot page through more<br/>than 10,000 hits using the from and size parameters. To page through more<br/>hits, use the search_after parameter.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> Size(int? size)
 	{
 		SizeValue = size;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Stats groups to associate with the search. Each group maintains a statistics<br/>aggregation for its associated searches. You can retrieve these stats using<br/>the indices stats API.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> Stats(ICollection<string>? stats)
 	{
 		StatsValue = stats;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>List of stored fields to return as part of a hit. If no fields are specified,<br/>no stored fields are included in the response. If this field is specified, the _source<br/>parameter defaults to false. You can pass _source: true to return both source fields<br/>and stored fields in the search response.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields)
 	{
 		StoredFieldsValue = storedFields;
@@ -633,30 +690,45 @@ public MultisearchBodyDescriptor<TDocument> Suggest(Action<Core.Search.Suggester
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Maximum number of documents to collect for each shard. If a query reaches this<br/>limit, Elasticsearch terminates the query early. Elasticsearch collects documents<br/>before sorting. Defaults to 0, which does not terminate query execution early.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> TerminateAfter(long? terminateAfter)
 	{
 		TerminateAfterValue = terminateAfter;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the period of time to wait for a response from each shard. If no response<br/>is received before the timeout expires, the request fails and returns an error.<br/>Defaults to no timeout.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> Timeout(string? timeout)
 	{
 		TimeoutValue = timeout;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, calculate and return document scores, even if the scores are not used for sorting.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> TrackScores(bool? trackScores = true)
 	{
 		TrackScoresValue = trackScores;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Number of hits matching the query to count accurately. If true, the exact<br/>number of hits is returned at the cost of some performance. If false, the<br/>response does not include the total number of hits matching the query.<br/>Defaults to 10,000 hits.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> TrackTotalHits(Elastic.Clients.Elasticsearch.Core.Search.TrackHits? trackTotalHits)
 	{
 		TrackTotalHitsValue = trackTotalHits;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns document version as part of a hit.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor<TDocument> Version(bool? version = true)
 	{
 		VersionValue = version;
@@ -1019,120 +1091,66 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MultisearchBodyDescriptor : SerializableDescriptor<MultisearchBodyDescriptor>
 {
 	internal MultisearchBodyDescriptor(Action<MultisearchBodyDescriptor> configure) => configure.Invoke(this);
+
 	public MultisearchBodyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; }
-
 	private Core.Search.FieldCollapseDescriptor CollapseDescriptor { get; set; }
-
 	private Action<Core.Search.FieldCollapseDescriptor> CollapseDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor DocvalueFieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor> DocvalueFieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor>[] DocvalueFieldsDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? FieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor FieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor> FieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor>[] FieldsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Highlight? HighlightValue { get; set; }
-
 	private Core.Search.HighlightDescriptor HighlightDescriptor { get; set; }
-
 	private Action<Core.Search.HighlightDescriptor> HighlightDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.KnnQuery? KnnValue { get; set; }
-
 	private KnnQueryDescriptor KnnDescriptor { get; set; }
-
 	private Action<KnnQueryDescriptor> KnnDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? PostFilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor PostFilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> PostFilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Core.Search.Rescore>? RescoreValue { get; set; }
-
 	private Core.Search.RescoreDescriptor RescoreDescriptor { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor> RescoreDescriptorAction { get; set; }
-
 	private Action<Core.Search.RescoreDescriptor>[] RescoreDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private bool? ExplainValue { get; set; }
-
 	private IDictionary<string, object>? ExtValue { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? IndicesBoostValue { get; set; }
-
 	private double? MinScoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? PitValue { get; set; }
-
 	private Core.Search.PointInTimeReferenceDescriptor PitDescriptor { get; set; }
-
 	private Action<Core.Search.PointInTimeReferenceDescriptor> PitDescriptorAction { get; set; }
-
 	private bool? ProfileValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFieldsValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.FieldValue>? SearchAfterValue { get; set; }
-
 	private bool? SeqNoPrimaryTermValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private ICollection<string>? StatsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Suggester? SuggestValue { get; set; }
-
 	private Core.Search.SuggesterDescriptor SuggestDescriptor { get; set; }
-
 	private Action<Core.Search.SuggesterDescriptor> SuggestDescriptorAction { get; set; }
-
 	private long? TerminateAfterValue { get; set; }
-
 	private string? TimeoutValue { get; set; }
-
 	private bool? TrackScoresValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.TrackHits? TrackTotalHitsValue { get; set; }
-
 	private bool? VersionValue { get; set; }
 
 	public MultisearchBodyDescriptor Collapse(Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? collapse)
@@ -1159,6 +1177,9 @@ public MultisearchBodyDescriptor Collapse(Action<Core.Search.FieldCollapseDescri
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns doc values for field<br/>names matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor DocvalueFields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? docvalueFields)
 	{
 		DocvalueFieldsDescriptor = null;
@@ -1195,6 +1216,9 @@ public MultisearchBodyDescriptor DocvalueFields(params Action<QueryDsl.FieldAndF
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Array of wildcard (*) patterns. The request returns values for field names<br/>matching these patterns in the hits.fields property of the response.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor Fields(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? fields)
 	{
 		FieldsDescriptor = null;
@@ -1255,6 +1279,9 @@ public MultisearchBodyDescriptor Highlight(Action<Core.Search.HighlightDescripto
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the approximate kNN search to run.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor Knn(Elastic.Clients.Elasticsearch.KnnQuery? knn)
 	{
 		KnnDescriptor = null;
@@ -1303,6 +1330,9 @@ public MultisearchBodyDescriptor PostFilter(Action<QueryDsl.QueryDescriptor> con
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines the search definition using the Query DSL.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
 	{
 		QueryDescriptor = null;
@@ -1399,42 +1429,63 @@ public MultisearchBodyDescriptor Sort(params Action<SortOptionsDescriptor>[] con
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Indicates which source fields are returned for matching documents. These<br/>fields are returned in the hits._source property of the search response.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source)
 	{
 		SourceValue = source;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns detailed information about score computation as part of a hit.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor Explain(bool? explain = true)
 	{
 		ExplainValue = explain;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Configuration of search extensions defined by Elasticsearch plugins.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor Ext(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		ExtValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Starting document offset. By default, you cannot page through more than 10,000<br/>hits using the from and size parameters. To page through more hits, use the<br/>search_after parameter.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor From(int? from)
 	{
 		FromValue = from;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Boosts the _score of documents from specified indices.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor IndicesBoost(ICollection<IDictionary<Elastic.Clients.Elasticsearch.IndexName, double>>? indicesBoost)
 	{
 		IndicesBoostValue = indicesBoost;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Minimum _score for matching documents. Documents with a lower _score are<br/>not included in the search results.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor MinScore(double? minScore)
 	{
 		MinScoreValue = minScore;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Limits the search to a point in time (PIT). If you provide a PIT, you<br/>cannot specify an <index> in the request path.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor Pit(Elastic.Clients.Elasticsearch.Core.Search.PointInTimeReference? pit)
 	{
 		PitDescriptor = null;
@@ -1465,12 +1516,18 @@ public MultisearchBodyDescriptor Profile(bool? profile = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Defines one or more runtime fields in the search request. These fields take<br/>precedence over mapped fields with the same name.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor RuntimeMappings(Func<FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>, FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>> selector)
 	{
 		RuntimeMappingsValue = selector?.Invoke(new FluentDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Retrieve a script evaluation (based on different fields) for each hit.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor ScriptFields(Func<FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>, FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>> selector)
 	{
 		ScriptFieldsValue = selector?.Invoke(new FluentDictionary<string, Elastic.Clients.Elasticsearch.ScriptField>());
@@ -1483,24 +1540,36 @@ public MultisearchBodyDescriptor SearchAfter(ICollection<Elastic.Clients.Elastic
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns sequence number and primary term of the last modification<br/>of each hit. See Optimistic concurrency control.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor SeqNoPrimaryTerm(bool? seqNoPrimaryTerm = true)
 	{
 		SeqNoPrimaryTermValue = seqNoPrimaryTerm;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The number of hits to return. By default, you cannot page through more<br/>than 10,000 hits using the from and size parameters. To page through more<br/>hits, use the search_after parameter.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor Size(int? size)
 	{
 		SizeValue = size;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Stats groups to associate with the search. Each group maintains a statistics<br/>aggregation for its associated searches. You can retrieve these stats using<br/>the indices stats API.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor Stats(ICollection<string>? stats)
 	{
 		StatsValue = stats;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>List of stored fields to return as part of a hit. If no fields are specified,<br/>no stored fields are included in the response. If this field is specified, the _source<br/>parameter defaults to false. You can pass _source: true to return both source fields<br/>and stored fields in the search response.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields)
 	{
 		StoredFieldsValue = storedFields;
@@ -1531,30 +1600,45 @@ public MultisearchBodyDescriptor Suggest(Action<Core.Search.SuggesterDescriptor>
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Maximum number of documents to collect for each shard. If a query reaches this<br/>limit, Elasticsearch terminates the query early. Elasticsearch collects documents<br/>before sorting. Defaults to 0, which does not terminate query execution early.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor TerminateAfter(long? terminateAfter)
 	{
 		TerminateAfterValue = terminateAfter;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the period of time to wait for a response from each shard. If no response<br/>is received before the timeout expires, the request fails and returns an error.<br/>Defaults to no timeout.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor Timeout(string? timeout)
 	{
 		TimeoutValue = timeout;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, calculate and return document scores, even if the scores are not used for sorting.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor TrackScores(bool? trackScores = true)
 	{
 		TrackScoresValue = trackScores;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Number of hits matching the query to count accurately. If true, the exact<br/>number of hits is returned at the cost of some performance. If false, the<br/>response does not include the total number of hits matching the query.<br/>Defaults to 10,000 hits.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor TrackTotalHits(Elastic.Clients.Elasticsearch.Core.Search.TrackHits? trackTotalHits)
 	{
 		TrackTotalHitsValue = trackTotalHits;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If true, returns document version as part of a hit.</para>
+	/// </summary>
 	public MultisearchBodyDescriptor Version(bool? version = true)
 	{
 		VersionValue = version;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchHeader.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchHeader.g.cs
index ac7877444bc..92983a6e028 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchHeader.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchHeader.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,72 +25,59 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.MSearch;
+
+/// <summary>
+/// <para>Contains parameters used to limit or change the subsequent search body request.</para>
+/// </summary>
 public sealed partial class MultisearchHeader
 {
 	[JsonInclude, JsonPropertyName("allow_no_indices")]
 	public bool? AllowNoIndices { get; set; }
-
 	[JsonInclude, JsonPropertyName("allow_partial_search_results")]
 	public bool? AllowPartialSearchResults { get; set; }
-
 	[JsonInclude, JsonPropertyName("ccs_minimize_roundtrips")]
 	public bool? CcsMinimizeRoundtrips { get; set; }
-
 	[JsonInclude, JsonPropertyName("expand_wildcards")]
 	[JsonConverter(typeof(ExpandWildcardsConverter))]
 	public ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcards { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_throttled")]
 	public bool? IgnoreThrottled { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_unavailable")]
 	public bool? IgnoreUnavailable { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.Indices? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("preference")]
 	public string? Preference { get; set; }
-
 	[JsonInclude, JsonPropertyName("request_cache")]
 	public bool? RequestCache { get; set; }
-
 	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_type")]
 	public Elastic.Clients.Elasticsearch.SearchType? SearchType { get; set; }
 }
 
+/// <summary>
+/// <para>Contains parameters used to limit or change the subsequent search body request.</para>
+/// </summary>
 public sealed partial class MultisearchHeaderDescriptor : SerializableDescriptor<MultisearchHeaderDescriptor>
 {
 	internal MultisearchHeaderDescriptor(Action<MultisearchHeaderDescriptor> configure) => configure.Invoke(this);
+
 	public MultisearchHeaderDescriptor() : base()
 	{
 	}
 
 	private bool? AllowNoIndicesValue { get; set; }
-
 	private bool? AllowPartialSearchResultsValue { get; set; }
-
 	private bool? CcsMinimizeRoundtripsValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.ExpandWildcard>? ExpandWildcardsValue { get; set; }
-
 	private bool? IgnoreThrottledValue { get; set; }
-
 	private bool? IgnoreUnavailableValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Indices? IndexValue { get; set; }
-
 	private string? PreferenceValue { get; set; }
-
 	private bool? RequestCacheValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SearchType? SearchTypeValue { get; set; }
 
 	public MultisearchHeaderDescriptor AllowNoIndices(bool? allowNoIndices = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearchTemplate/TemplateConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearchTemplate/TemplateConfig.g.cs
index a156d337a4e..cb2ee974aa5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearchTemplate/TemplateConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearchTemplate/TemplateConfig.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.MSearchTemplate;
+
 public sealed partial class TemplateConfig
 {
 	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
 
+	/// <summary>
+	/// <para>ID of the search template to use. If no source is specified,<br/>this parameter is required.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("id")]
 	public Elastic.Clients.Elasticsearch.Id? Id { get; set; }
-
 	[JsonInclude, JsonPropertyName("params")]
 	public IDictionary<string, object>? Params { get; set; }
-
 	[JsonInclude, JsonPropertyName("profile")]
 	public bool? Profile { get; set; }
 
+	/// <summary>
+	/// <para>An inline search template. Supports the same parameters as the search API's<br/>request body. Also supports Mustache variables. If no id is specified, this<br/>parameter is required.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("source")]
 	public string? Source { get; set; }
 }
@@ -46,18 +52,15 @@ public sealed partial class TemplateConfig
 public sealed partial class TemplateConfigDescriptor : SerializableDescriptor<TemplateConfigDescriptor>
 {
 	internal TemplateConfigDescriptor(Action<TemplateConfigDescriptor> configure) => configure.Invoke(this);
+
 	public TemplateConfigDescriptor() : base()
 	{
 	}
 
 	private bool? ExplainValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id? IdValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private bool? ProfileValue { get; set; }
-
 	private string? SourceValue { get; set; }
 
 	public TemplateConfigDescriptor Explain(bool? explain = true)
@@ -66,6 +69,9 @@ public TemplateConfigDescriptor Explain(bool? explain = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>ID of the search template to use. If no source is specified,<br/>this parameter is required.</para>
+	/// </summary>
 	public TemplateConfigDescriptor Id(Elastic.Clients.Elasticsearch.Id? id)
 	{
 		IdValue = id;
@@ -84,6 +90,9 @@ public TemplateConfigDescriptor Profile(bool? profile = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>An inline search template. Supports the same parameters as the search API's<br/>request body. Also supports Mustache variables. If no id is specified, this<br/>parameter is required.</para>
+	/// </summary>
 	public TemplateConfigDescriptor Source(string? source)
 	{
 		SourceValue = source;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiGetResponseItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiGetResponseItem.g.cs
index 8ee50c96ca2..a40b1033bd3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiGetResponseItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiGetResponseItem.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.MGet;
+
 public sealed partial class MultiGetResponseItem<TDocument> : Union<Elastic.Clients.Elasticsearch.Core.Get.GetResult<TDocument>, Elastic.Clients.Elasticsearch.Core.MGet.MultiGetError>
 {
 	public MultiGetResponseItem(Elastic.Clients.Elasticsearch.Core.Get.GetResult<TDocument> result) : base(result)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiSearchResponseItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiSearchResponseItem.g.cs
index 20835f02f4b..2fcb7cfb8e5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiSearchResponseItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MultiSearchResponseItem.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.MSearch;
+
 public sealed partial class MultiSearchResponseItem<TDocument> : Union<Elastic.Clients.Elasticsearch.Core.MSearch.MultiSearchItem<TDocument>, Elastic.Clients.Elasticsearch.ErrorResponseBase>
 {
 	public MultiSearchResponseItem(Elastic.Clients.Elasticsearch.Core.MSearch.MultiSearchItem<TDocument> result) : base(result)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/DocumentRating.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/DocumentRating.g.cs
index 8658509df62..fe2eb5a7d45 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/DocumentRating.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/DocumentRating.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,25 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
 public sealed partial class DocumentRating
 {
+	/// <summary>
+	/// <para>The document ID.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_id")]
 	public Elastic.Clients.Elasticsearch.Id Id { get; set; }
 
+	/// <summary>
+	/// <para>The document’s index. For data streams, this should be the document’s backing index.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_index")]
 	public Elastic.Clients.Elasticsearch.IndexName Index { get; set; }
 
+	/// <summary>
+	/// <para>The document’s relevance with regard to this search request.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("rating")]
 	public int Rating { get; set; }
 }
@@ -40,28 +51,36 @@ public sealed partial class DocumentRating
 public sealed partial class DocumentRatingDescriptor : SerializableDescriptor<DocumentRatingDescriptor>
 {
 	internal DocumentRatingDescriptor(Action<DocumentRatingDescriptor> configure) => configure.Invoke(this);
+
 	public DocumentRatingDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Id IdValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName IndexValue { get; set; }
-
 	private int RatingValue { get; set; }
 
+	/// <summary>
+	/// <para>The document ID.</para>
+	/// </summary>
 	public DocumentRatingDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		IdValue = id;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The document’s index. For data streams, this should be the document’s backing index.</para>
+	/// </summary>
 	public DocumentRatingDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
 	{
 		IndexValue = index;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The document’s relevance with regard to this search request.</para>
+	/// </summary>
 	public DocumentRatingDescriptor Rating(int rating)
 	{
 		RatingValue = rating;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalHit.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalHit.g.cs
index 141c5940acc..bf29a47110f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalHit.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalHit.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
 public sealed partial class RankEvalHit
 {
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("_score")]
 	public double Score { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalHitItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalHitItem.g.cs
index 810ea33e976..770894d454a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalHitItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalHitItem.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
 public sealed partial class RankEvalHitItem
 {
 	[JsonInclude, JsonPropertyName("hit")]
 	public Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalHit Hit { get; init; }
-
 	[JsonInclude, JsonPropertyName("rating")]
 	public double? Rating { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetric.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetric.g.cs
index 4031ac18075..780d43d6333 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetric.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetric.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
 public sealed partial class RankEvalMetric
 {
 	[JsonInclude, JsonPropertyName("dcg")]
 	public Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricDiscountedCumulativeGain? Dcg { get; set; }
-
 	[JsonInclude, JsonPropertyName("expected_reciprocal_rank")]
 	public Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricExpectedReciprocalRank? ExpectedReciprocalRank { get; set; }
-
 	[JsonInclude, JsonPropertyName("mean_reciprocal_rank")]
 	public Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricMeanReciprocalRank? MeanReciprocalRank { get; set; }
-
 	[JsonInclude, JsonPropertyName("precision")]
 	public Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricPrecision? Precision { get; set; }
-
 	[JsonInclude, JsonPropertyName("recall")]
 	public Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricRecall? Recall { get; set; }
 }
@@ -46,38 +44,25 @@ public sealed partial class RankEvalMetric
 public sealed partial class RankEvalMetricDescriptor : SerializableDescriptor<RankEvalMetricDescriptor>
 {
 	internal RankEvalMetricDescriptor(Action<RankEvalMetricDescriptor> configure) => configure.Invoke(this);
+
 	public RankEvalMetricDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricDiscountedCumulativeGain? DcgValue { get; set; }
-
 	private RankEvalMetricDiscountedCumulativeGainDescriptor DcgDescriptor { get; set; }
-
 	private Action<RankEvalMetricDiscountedCumulativeGainDescriptor> DcgDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricExpectedReciprocalRank? ExpectedReciprocalRankValue { get; set; }
-
 	private RankEvalMetricExpectedReciprocalRankDescriptor ExpectedReciprocalRankDescriptor { get; set; }
-
 	private Action<RankEvalMetricExpectedReciprocalRankDescriptor> ExpectedReciprocalRankDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricMeanReciprocalRank? MeanReciprocalRankValue { get; set; }
-
 	private RankEvalMetricMeanReciprocalRankDescriptor MeanReciprocalRankDescriptor { get; set; }
-
 	private Action<RankEvalMetricMeanReciprocalRankDescriptor> MeanReciprocalRankDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricPrecision? PrecisionValue { get; set; }
-
 	private RankEvalMetricPrecisionDescriptor PrecisionDescriptor { get; set; }
-
 	private Action<RankEvalMetricPrecisionDescriptor> PrecisionDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricRecall? RecallValue { get; set; }
-
 	private RankEvalMetricRecallDescriptor RecallDescriptor { get; set; }
-
 	private Action<RankEvalMetricRecallDescriptor> RecallDescriptorAction { get; set; }
 
 	public RankEvalMetricDescriptor Dcg(Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalMetricDiscountedCumulativeGain? dcg)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricDetail.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricDetail.g.cs
index c3444c73415..37891769118 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricDetail.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricDetail.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,31 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
 public sealed partial class RankEvalMetricDetail
 {
+	/// <summary>
+	/// <para>The hits section shows a grouping of the search results with their supplied ratings</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("hits")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalHitItem> Hits { get; init; }
 
+	/// <summary>
+	/// <para>The metric_details give additional information about the calculated quality metric (e.g. how many of the retrieved documents were relevant). The content varies for each metric but allows for better interpretation of the results</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("metric_details")]
 	public IReadOnlyDictionary<string, IReadOnlyDictionary<string, object>> MetricDetails { get; init; }
 
+	/// <summary>
+	/// <para>The metric_score in the details section shows the contribution of this query to the global quality metric score</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("metric_score")]
 	public double MetricScore { get; init; }
 
+	/// <summary>
+	/// <para>The unrated_docs section contains an _index and _id entry for each document in the search result for this query that didn’t have a ratings value. This can be used to ask the user to supply ratings for these documents</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("unrated_docs")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.RankEval.UnratedDocument> UnratedDocs { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricDiscountedCumulativeGain.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricDiscountedCumulativeGain.g.cs
index ac1c3364ba4..d56e8f586fe 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricDiscountedCumulativeGain.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricDiscountedCumulativeGain.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,26 +25,35 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
+/// <summary>
+/// <para>Discounted cumulative gain (DCG)</para>
+/// </summary>
 public sealed partial class RankEvalMetricDiscountedCumulativeGain
 {
 	[JsonInclude, JsonPropertyName("k")]
 	public int? k { get; set; }
 
+	/// <summary>
+	/// <para>If set to true, this metric will calculate the Normalized DCG.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("normalize")]
 	public bool? Normalize { get; set; }
 }
 
+/// <summary>
+/// <para>Discounted cumulative gain (DCG)</para>
+/// </summary>
 public sealed partial class RankEvalMetricDiscountedCumulativeGainDescriptor : SerializableDescriptor<RankEvalMetricDiscountedCumulativeGainDescriptor>
 {
 	internal RankEvalMetricDiscountedCumulativeGainDescriptor(Action<RankEvalMetricDiscountedCumulativeGainDescriptor> configure) => configure.Invoke(this);
+
 	public RankEvalMetricDiscountedCumulativeGainDescriptor() : base()
 	{
 	}
 
 	private int? kValue { get; set; }
-
 	private bool? NormalizeValue { get; set; }
 
 	public RankEvalMetricDiscountedCumulativeGainDescriptor k(int? k)
@@ -51,6 +62,9 @@ public RankEvalMetricDiscountedCumulativeGainDescriptor k(int? k)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If set to true, this metric will calculate the Normalized DCG.</para>
+	/// </summary>
 	public RankEvalMetricDiscountedCumulativeGainDescriptor Normalize(bool? normalize = true)
 	{
 		NormalizeValue = normalize;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricExpectedReciprocalRank.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricExpectedReciprocalRank.g.cs
index 03c2f06ee08..528b711f9f1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricExpectedReciprocalRank.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricExpectedReciprocalRank.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,26 +25,35 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
+/// <summary>
+/// <para>Expected Reciprocal Rank (ERR)</para>
+/// </summary>
 public sealed partial class RankEvalMetricExpectedReciprocalRank
 {
 	[JsonInclude, JsonPropertyName("k")]
 	public int? k { get; set; }
 
+	/// <summary>
+	/// <para>The highest relevance grade used in the user-supplied relevance judgments.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("maximum_relevance")]
 	public int MaximumRelevance { get; set; }
 }
 
+/// <summary>
+/// <para>Expected Reciprocal Rank (ERR)</para>
+/// </summary>
 public sealed partial class RankEvalMetricExpectedReciprocalRankDescriptor : SerializableDescriptor<RankEvalMetricExpectedReciprocalRankDescriptor>
 {
 	internal RankEvalMetricExpectedReciprocalRankDescriptor(Action<RankEvalMetricExpectedReciprocalRankDescriptor> configure) => configure.Invoke(this);
+
 	public RankEvalMetricExpectedReciprocalRankDescriptor() : base()
 	{
 	}
 
 	private int? kValue { get; set; }
-
 	private int MaximumRelevanceValue { get; set; }
 
 	public RankEvalMetricExpectedReciprocalRankDescriptor k(int? k)
@@ -51,6 +62,9 @@ public RankEvalMetricExpectedReciprocalRankDescriptor k(int? k)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The highest relevance grade used in the user-supplied relevance judgments.</para>
+	/// </summary>
 	public RankEvalMetricExpectedReciprocalRankDescriptor MaximumRelevance(int maximumRelevance)
 	{
 		MaximumRelevanceValue = maximumRelevance;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricMeanReciprocalRank.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricMeanReciprocalRank.g.cs
index 5ed707f7975..d42789e0c36 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricMeanReciprocalRank.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricMeanReciprocalRank.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,26 +25,31 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
+/// <summary>
+/// <para>Mean Reciprocal Rank</para>
+/// </summary>
 public sealed partial class RankEvalMetricMeanReciprocalRank
 {
 	[JsonInclude, JsonPropertyName("k")]
 	public int? k { get; set; }
-
 	[JsonInclude, JsonPropertyName("relevant_rating_threshold")]
 	public int? RelevantRatingThreshold { get; set; }
 }
 
+/// <summary>
+/// <para>Mean Reciprocal Rank</para>
+/// </summary>
 public sealed partial class RankEvalMetricMeanReciprocalRankDescriptor : SerializableDescriptor<RankEvalMetricMeanReciprocalRankDescriptor>
 {
 	internal RankEvalMetricMeanReciprocalRankDescriptor(Action<RankEvalMetricMeanReciprocalRankDescriptor> configure) => configure.Invoke(this);
+
 	public RankEvalMetricMeanReciprocalRankDescriptor() : base()
 	{
 	}
 
 	private int? kValue { get; set; }
-
 	private int? RelevantRatingThresholdValue { get; set; }
 
 	public RankEvalMetricMeanReciprocalRankDescriptor k(int? k)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricPrecision.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricPrecision.g.cs
index 18a9ee8c5a7..c2bb9b96d60 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricPrecision.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricPrecision.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,33 +25,42 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
+/// <summary>
+/// <para>Precision at K (P@k)</para>
+/// </summary>
 public sealed partial class RankEvalMetricPrecision
 {
+	/// <summary>
+	/// <para>Controls how unlabeled documents in the search results are counted. If set to true, unlabeled documents are ignored and neither count as relevant or irrelevant. Set to false (the default), they are treated as irrelevant.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("ignore_unlabeled")]
 	public bool? IgnoreUnlabeled { get; set; }
-
 	[JsonInclude, JsonPropertyName("k")]
 	public int? k { get; set; }
-
 	[JsonInclude, JsonPropertyName("relevant_rating_threshold")]
 	public int? RelevantRatingThreshold { get; set; }
 }
 
+/// <summary>
+/// <para>Precision at K (P@k)</para>
+/// </summary>
 public sealed partial class RankEvalMetricPrecisionDescriptor : SerializableDescriptor<RankEvalMetricPrecisionDescriptor>
 {
 	internal RankEvalMetricPrecisionDescriptor(Action<RankEvalMetricPrecisionDescriptor> configure) => configure.Invoke(this);
+
 	public RankEvalMetricPrecisionDescriptor() : base()
 	{
 	}
 
 	private bool? IgnoreUnlabeledValue { get; set; }
-
 	private int? kValue { get; set; }
-
 	private int? RelevantRatingThresholdValue { get; set; }
 
+	/// <summary>
+	/// <para>Controls how unlabeled documents in the search results are counted. If set to true, unlabeled documents are ignored and neither count as relevant or irrelevant. Set to false (the default), they are treated as irrelevant.</para>
+	/// </summary>
 	public RankEvalMetricPrecisionDescriptor IgnoreUnlabeled(bool? ignoreUnlabeled = true)
 	{
 		IgnoreUnlabeledValue = ignoreUnlabeled;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricRecall.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricRecall.g.cs
index 5c49bffc855..9e67178418f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricRecall.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalMetricRecall.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,26 +25,31 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
+/// <summary>
+/// <para>Recall at K (R@k)</para>
+/// </summary>
 public sealed partial class RankEvalMetricRecall
 {
 	[JsonInclude, JsonPropertyName("k")]
 	public int? k { get; set; }
-
 	[JsonInclude, JsonPropertyName("relevant_rating_threshold")]
 	public int? RelevantRatingThreshold { get; set; }
 }
 
+/// <summary>
+/// <para>Recall at K (R@k)</para>
+/// </summary>
 public sealed partial class RankEvalMetricRecallDescriptor : SerializableDescriptor<RankEvalMetricRecallDescriptor>
 {
 	internal RankEvalMetricRecallDescriptor(Action<RankEvalMetricRecallDescriptor> configure) => configure.Invoke(this);
+
 	public RankEvalMetricRecallDescriptor() : base()
 	{
 	}
 
 	private int? kValue { get; set; }
-
 	private int? RelevantRatingThresholdValue { get; set; }
 
 	public RankEvalMetricRecallDescriptor k(int? k)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs
index a4b47ffd228..c8c46254adc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
 public sealed partial class RankEvalQuery
 {
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
 }
@@ -37,16 +38,14 @@ public sealed partial class RankEvalQuery
 public sealed partial class RankEvalQueryDescriptor<TDocument> : SerializableDescriptor<RankEvalQueryDescriptor<TDocument>>
 {
 	internal RankEvalQueryDescriptor(Action<RankEvalQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RankEvalQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private int? SizeValue { get; set; }
 
 	public RankEvalQueryDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query)
@@ -111,16 +110,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RankEvalQueryDescriptor : SerializableDescriptor<RankEvalQueryDescriptor>
 {
 	internal RankEvalQueryDescriptor(Action<RankEvalQueryDescriptor> configure) => configure.Invoke(this);
+
 	public RankEvalQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private int? SizeValue { get; set; }
 
 	public RankEvalQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalRequestItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalRequestItem.g.cs
index 60341b7975c..93462d9f5c9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalRequestItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/RankEvalRequestItem.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,37 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
 public sealed partial class RankEvalRequestItem
 {
+	/// <summary>
+	/// <para>The search request’s ID, used to group result details later.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("id")]
 	public Elastic.Clients.Elasticsearch.Id Id { get; set; }
 
+	/// <summary>
+	/// <para>The search template parameters.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("params")]
 	public IDictionary<string, object>? Params { get; set; }
 
+	/// <summary>
+	/// <para>List of document ratings</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("ratings")]
 	public ICollection<Elastic.Clients.Elasticsearch.Core.RankEval.DocumentRating> Ratings { get; set; }
 
+	/// <summary>
+	/// <para>The query being evaluated.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("request")]
 	public Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalQuery? Request { get; set; }
 
+	/// <summary>
+	/// <para>The search template Id</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("template_id")]
 	public Elastic.Clients.Elasticsearch.Id? TemplateId { get; set; }
 }
@@ -46,30 +63,25 @@ public sealed partial class RankEvalRequestItem
 public sealed partial class RankEvalRequestItemDescriptor<TDocument> : SerializableDescriptor<RankEvalRequestItemDescriptor<TDocument>>
 {
 	internal RankEvalRequestItemDescriptor(Action<RankEvalRequestItemDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RankEvalRequestItemDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalQuery? RequestValue { get; set; }
-
 	private RankEvalQueryDescriptor<TDocument> RequestDescriptor { get; set; }
-
 	private Action<RankEvalQueryDescriptor<TDocument>> RequestDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id IdValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Core.RankEval.DocumentRating> RatingsValue { get; set; }
-
 	private DocumentRatingDescriptor RatingsDescriptor { get; set; }
-
 	private Action<DocumentRatingDescriptor> RatingsDescriptorAction { get; set; }
-
 	private Action<DocumentRatingDescriptor>[] RatingsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id? TemplateIdValue { get; set; }
 
+	/// <summary>
+	/// <para>The query being evaluated.</para>
+	/// </summary>
 	public RankEvalRequestItemDescriptor<TDocument> Request(Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalQuery? request)
 	{
 		RequestDescriptor = null;
@@ -94,18 +106,27 @@ public RankEvalRequestItemDescriptor<TDocument> Request(Action<RankEvalQueryDesc
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The search request’s ID, used to group result details later.</para>
+	/// </summary>
 	public RankEvalRequestItemDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		IdValue = id;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The search template parameters.</para>
+	/// </summary>
 	public RankEvalRequestItemDescriptor<TDocument> Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		ParamsValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>List of document ratings</para>
+	/// </summary>
 	public RankEvalRequestItemDescriptor<TDocument> Ratings(ICollection<Elastic.Clients.Elasticsearch.Core.RankEval.DocumentRating> ratings)
 	{
 		RatingsDescriptor = null;
@@ -142,6 +163,9 @@ public RankEvalRequestItemDescriptor<TDocument> Ratings(params Action<DocumentRa
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The search template Id</para>
+	/// </summary>
 	public RankEvalRequestItemDescriptor<TDocument> TemplateId(Elastic.Clients.Elasticsearch.Id? templateId)
 	{
 		TemplateIdValue = templateId;
@@ -219,30 +243,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RankEvalRequestItemDescriptor : SerializableDescriptor<RankEvalRequestItemDescriptor>
 {
 	internal RankEvalRequestItemDescriptor(Action<RankEvalRequestItemDescriptor> configure) => configure.Invoke(this);
+
 	public RankEvalRequestItemDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalQuery? RequestValue { get; set; }
-
 	private RankEvalQueryDescriptor RequestDescriptor { get; set; }
-
 	private Action<RankEvalQueryDescriptor> RequestDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id IdValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Core.RankEval.DocumentRating> RatingsValue { get; set; }
-
 	private DocumentRatingDescriptor RatingsDescriptor { get; set; }
-
 	private Action<DocumentRatingDescriptor> RatingsDescriptorAction { get; set; }
-
 	private Action<DocumentRatingDescriptor>[] RatingsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id? TemplateIdValue { get; set; }
 
+	/// <summary>
+	/// <para>The query being evaluated.</para>
+	/// </summary>
 	public RankEvalRequestItemDescriptor Request(Elastic.Clients.Elasticsearch.Core.RankEval.RankEvalQuery? request)
 	{
 		RequestDescriptor = null;
@@ -267,18 +286,27 @@ public RankEvalRequestItemDescriptor Request(Action<RankEvalQueryDescriptor> con
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The search request’s ID, used to group result details later.</para>
+	/// </summary>
 	public RankEvalRequestItemDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
 	{
 		IdValue = id;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The search template parameters.</para>
+	/// </summary>
 	public RankEvalRequestItemDescriptor Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
 	{
 		ParamsValue = selector?.Invoke(new FluentDictionary<string, object>());
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>List of document ratings</para>
+	/// </summary>
 	public RankEvalRequestItemDescriptor Ratings(ICollection<Elastic.Clients.Elasticsearch.Core.RankEval.DocumentRating> ratings)
 	{
 		RatingsDescriptor = null;
@@ -315,6 +343,9 @@ public RankEvalRequestItemDescriptor Ratings(params Action<DocumentRatingDescrip
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The search template Id</para>
+	/// </summary>
 	public RankEvalRequestItemDescriptor TemplateId(Elastic.Clients.Elasticsearch.Id? templateId)
 	{
 		TemplateIdValue = templateId;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/UnratedDocument.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/UnratedDocument.g.cs
index d180be41fc4..5c11435cf83 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/UnratedDocument.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/RankEval/UnratedDocument.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.RankEval;
+
 public sealed partial class UnratedDocument
 {
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Destination.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Destination.g.cs
index 47c91234818..fe96f9c8ffd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Destination.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Destination.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Reindex;
+
 public sealed partial class Destination
 {
 	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.IndexName Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("op_type")]
 	public Elastic.Clients.Elasticsearch.OpType? OpType { get; set; }
-
 	[JsonInclude, JsonPropertyName("pipeline")]
 	public string? Pipeline { get; set; }
-
 	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
-
 	[JsonInclude, JsonPropertyName("version_type")]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get; set; }
 }
@@ -46,18 +44,15 @@ public sealed partial class Destination
 public sealed partial class DestinationDescriptor : SerializableDescriptor<DestinationDescriptor>
 {
 	internal DestinationDescriptor(Action<DestinationDescriptor> configure) => configure.Invoke(this);
+
 	public DestinationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexName IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.OpType? OpTypeValue { get; set; }
-
 	private string? PipelineValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.VersionType? VersionTypeValue { get; set; }
 
 	public DestinationDescriptor Index(Elastic.Clients.Elasticsearch.IndexName index)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/RemoteSource.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/RemoteSource.g.cs
index 2cd220318cf..f79ad6d410b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/RemoteSource.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/RemoteSource.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Reindex;
+
 public sealed partial class RemoteSource
 {
 	[JsonInclude, JsonPropertyName("connect_timeout")]
 	public Elastic.Clients.Elasticsearch.Duration? ConnectTimeout { get; set; }
-
 	[JsonInclude, JsonPropertyName("headers")]
 	public IDictionary<string, string>? Headers { get; set; }
-
 	[JsonInclude, JsonPropertyName("host")]
 	public string Host { get; set; }
-
 	[JsonInclude, JsonPropertyName("password")]
 	public string? Password { get; set; }
-
 	[JsonInclude, JsonPropertyName("socket_timeout")]
 	public Elastic.Clients.Elasticsearch.Duration? SocketTimeout { get; set; }
-
 	[JsonInclude, JsonPropertyName("username")]
 	public Elastic.Clients.Elasticsearch.Username? Username { get; set; }
 }
@@ -49,20 +46,16 @@ public sealed partial class RemoteSource
 public sealed partial class RemoteSourceDescriptor : SerializableDescriptor<RemoteSourceDescriptor>
 {
 	internal RemoteSourceDescriptor(Action<RemoteSourceDescriptor> configure) => configure.Invoke(this);
+
 	public RemoteSourceDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Duration? ConnectTimeoutValue { get; set; }
-
 	private IDictionary<string, string>? HeadersValue { get; set; }
-
 	private string HostValue { get; set; }
-
 	private string? PasswordValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? SocketTimeoutValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Username? UsernameValue { get; set; }
 
 	public RemoteSourceDescriptor ConnectTimeout(Elastic.Clients.Elasticsearch.Duration? connectTimeout)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs
index 76b28202169..dcd5aedb3ec 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Reindex;
+
 public sealed partial class Source
 {
 	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Fields? SourceFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.Indices Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("remote")]
 	public Elastic.Clients.Elasticsearch.Core.Reindex.RemoteSource? Remote { get; set; }
-
 	[JsonInclude, JsonPropertyName("runtime_mappings")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappings { get; set; }
-
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
-
 	[JsonInclude, JsonPropertyName("slice")]
 	public Elastic.Clients.Elasticsearch.SlicedScroll? Slice { get; set; }
-
 	[JsonInclude, JsonPropertyName("sort"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
 }
@@ -55,42 +50,27 @@ public sealed partial class Source
 public sealed partial class SourceDescriptor<TDocument> : SerializableDescriptor<SourceDescriptor<TDocument>>
 {
 	internal SourceDescriptor(Action<SourceDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SourceDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; }
-
 	private SlicedScrollDescriptor<TDocument> SliceDescriptor { get; set; }
-
 	private Action<SlicedScrollDescriptor<TDocument>> SliceDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor<TDocument> SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? SourceFieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Indices IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Reindex.RemoteSource? RemoteValue { get; set; }
-
 	private RemoteSourceDescriptor RemoteDescriptor { get; set; }
-
 	private Action<RemoteSourceDescriptor> RemoteDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private int? SizeValue { get; set; }
 
 	public SourceDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
@@ -332,42 +312,27 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SourceDescriptor : SerializableDescriptor<SourceDescriptor>
 {
 	internal SourceDescriptor(Action<SourceDescriptor> configure) => configure.Invoke(this);
+
 	public SourceDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SlicedScroll? SliceValue { get; set; }
-
 	private SlicedScrollDescriptor SliceDescriptor { get; set; }
-
 	private Action<SlicedScrollDescriptor> SliceDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? SourceFieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Indices IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Reindex.RemoteSource? RemoteValue { get; set; }
-
 	private RemoteSourceDescriptor RemoteDescriptor { get; set; }
-
 	private Action<RemoteSourceDescriptor> RemoteDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeMappingsValue { get; set; }
-
 	private int? SizeValue { get; set; }
 
 	public SourceDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query? query)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexNode.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexNode.g.cs
index 7e30d718d46..ad0d625ceaa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexNode.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexNode.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.ReindexRethrottle;
+
 public sealed partial class ReindexNode
 {
 	[JsonInclude, JsonPropertyName("attributes")]
 	public IReadOnlyDictionary<string, string> Attributes { get; init; }
-
 	[JsonInclude, JsonPropertyName("host")]
 	public string Host { get; init; }
-
 	[JsonInclude, JsonPropertyName("ip")]
 	public string Ip { get; init; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-
 	[JsonInclude, JsonPropertyName("roles")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.NodeRole>? Roles { get; init; }
-
 	[JsonInclude, JsonPropertyName("tasks")]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.TaskId, Elastic.Clients.Elasticsearch.Core.ReindexRethrottle.ReindexTask> Tasks { get; init; }
-
 	[JsonInclude, JsonPropertyName("transport_address")]
 	public string TransportAddress { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexStatus.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexStatus.g.cs
index b5a8dfe69bb..dd61216cd02 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexStatus.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexStatus.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,46 +25,34 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.ReindexRethrottle;
+
 public sealed partial class ReindexStatus
 {
 	[JsonInclude, JsonPropertyName("batches")]
 	public long Batches { get; init; }
-
 	[JsonInclude, JsonPropertyName("created")]
 	public long Created { get; init; }
-
 	[JsonInclude, JsonPropertyName("deleted")]
 	public long Deleted { get; init; }
-
 	[JsonInclude, JsonPropertyName("noops")]
 	public long Noops { get; init; }
-
 	[JsonInclude, JsonPropertyName("requests_per_second")]
 	public float RequestsPerSecond { get; init; }
-
 	[JsonInclude, 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; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public long Total { get; init; }
-
 	[JsonInclude, JsonPropertyName("updated")]
 	public long Updated { get; init; }
-
 	[JsonInclude, JsonPropertyName("version_conflicts")]
 	public long VersionConflicts { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexTask.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexTask.g.cs
index 753645a0b93..d6549686c39 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexTask.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/ReindexRethrottle/ReindexTask.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.ReindexRethrottle;
+
 public sealed partial class ReindexTask
 {
 	[JsonInclude, JsonPropertyName("action")]
 	public string Action { get; init; }
-
 	[JsonInclude, JsonPropertyName("cancellable")]
 	public bool Cancellable { get; init; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-
 	[JsonInclude, JsonPropertyName("headers")]
 	public IReadOnlyDictionary<string, IReadOnlyCollection<string>> Headers { get; init; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public long Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("node")]
 	public string Node { get; init; }
-
 	[JsonInclude, JsonPropertyName("running_time_in_nanos")]
 	public long RunningTimeInNanos { get; init; }
-
 	[JsonInclude, JsonPropertyName("start_time_in_millis")]
 	public long StartTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.Core.ReindexRethrottle.ReindexStatus Status { get; init; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationBreakdown.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationBreakdown.g.cs
index cd9166b4aa5..9bc652e4fd6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationBreakdown.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationBreakdown.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,43 +25,32 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class AggregationBreakdown
 {
 	[JsonInclude, JsonPropertyName("build_aggregation")]
 	public long BuildAggregation { get; init; }
-
 	[JsonInclude, JsonPropertyName("build_aggregation_count")]
 	public long BuildAggregationCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("build_leaf_collector")]
 	public long BuildLeafCollector { get; init; }
-
 	[JsonInclude, JsonPropertyName("build_leaf_collector_count")]
 	public long BuildLeafCollectorCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("collect")]
 	public long Collect { get; init; }
-
 	[JsonInclude, JsonPropertyName("collect_count")]
 	public long CollectCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("initialize")]
 	public long Initialize { get; init; }
-
 	[JsonInclude, JsonPropertyName("initialize_count")]
 	public long InitializeCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("post_collection")]
 	public long? PostCollection { get; init; }
-
 	[JsonInclude, JsonPropertyName("post_collection_count")]
 	public long? PostCollectionCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("reduce")]
 	public long Reduce { get; init; }
-
 	[JsonInclude, JsonPropertyName("reduce_count")]
 	public long ReduceCount { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfile.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfile.g.cs
index bc679abfb80..1a12960c95c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfile.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfile.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class AggregationProfile
 {
 	[JsonInclude, JsonPropertyName("breakdown")]
 	public Elastic.Clients.Elasticsearch.Core.Search.AggregationBreakdown Breakdown { get; init; }
-
 	[JsonInclude, JsonPropertyName("children")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.AggregationProfile>? Children { get; init; }
-
 	[JsonInclude, JsonPropertyName("debug")]
 	public Elastic.Clients.Elasticsearch.Core.Search.AggregationProfileDebug? Debug { get; init; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-
 	[JsonInclude, JsonPropertyName("time_in_nanos")]
 	public long TimeInNanos { get; init; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfileDebug.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfileDebug.g.cs
index c83edf8f504..4fecff97322 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfileDebug.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfileDebug.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,91 +25,64 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class AggregationProfileDebug
 {
 	[JsonInclude, JsonPropertyName("built_buckets")]
 	public int? BuiltBuckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("chars_fetched")]
 	public int? CharsFetched { get; init; }
-
 	[JsonInclude, JsonPropertyName("collect_analyzed_count")]
 	public int? CollectAnalyzedCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("collect_analyzed_ns")]
 	public int? CollectAnalyzedNs { get; init; }
-
 	[JsonInclude, JsonPropertyName("collection_strategy")]
 	public string? CollectionStrategy { get; init; }
-
 	[JsonInclude, JsonPropertyName("deferred_aggregators")]
 	public IReadOnlyCollection<string>? DeferredAggregators { get; init; }
-
 	[JsonInclude, JsonPropertyName("delegate")]
 	public string? Delegate { get; init; }
-
 	[JsonInclude, JsonPropertyName("delegate_debug")]
 	public Elastic.Clients.Elasticsearch.Core.Search.AggregationProfileDebug? DelegateDebug { get; init; }
-
 	[JsonInclude, JsonPropertyName("empty_collectors_used")]
 	public int? EmptyCollectorsUsed { get; init; }
-
 	[JsonInclude, JsonPropertyName("extract_count")]
 	public int? ExtractCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("extract_ns")]
 	public int? ExtractNs { get; init; }
-
 	[JsonInclude, JsonPropertyName("filters")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.AggregationProfileDelegateDebugFilter>? Filters { get; init; }
-
 	[JsonInclude, JsonPropertyName("has_filter")]
 	public bool? HasFilter { get; init; }
-
 	[JsonInclude, JsonPropertyName("map_reducer")]
 	public string? MapReducer { get; init; }
-
 	[JsonInclude, JsonPropertyName("numeric_collectors_used")]
 	public int? NumericCollectorsUsed { get; init; }
-
 	[JsonInclude, JsonPropertyName("ordinals_collectors_overhead_too_high")]
 	public int? OrdinalsCollectorsOverheadTooHigh { get; init; }
-
 	[JsonInclude, JsonPropertyName("ordinals_collectors_used")]
 	public int? OrdinalsCollectorsUsed { get; init; }
-
 	[JsonInclude, JsonPropertyName("result_strategy")]
 	public string? ResultStrategy { get; init; }
-
 	[JsonInclude, JsonPropertyName("segments_collected")]
 	public int? SegmentsCollected { get; init; }
-
 	[JsonInclude, JsonPropertyName("segments_counted")]
 	public int? SegmentsCounted { get; init; }
-
 	[JsonInclude, JsonPropertyName("segments_with_deleted_docs")]
 	public int? SegmentsWithDeletedDocs { get; init; }
-
 	[JsonInclude, JsonPropertyName("segments_with_doc_count_field")]
 	public int? SegmentsWithDocCountField { get; init; }
-
 	[JsonInclude, JsonPropertyName("segments_with_multi_valued_ords")]
 	public int? SegmentsWithMultiValuedOrds { get; init; }
-
 	[JsonInclude, JsonPropertyName("segments_with_single_valued_ords")]
 	public int? SegmentsWithSingleValuedOrds { get; init; }
-
 	[JsonInclude, JsonPropertyName("string_hashing_collectors_used")]
 	public int? StringHashingCollectorsUsed { get; init; }
-
 	[JsonInclude, JsonPropertyName("surviving_buckets")]
 	public int? SurvivingBuckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_buckets")]
 	public int? TotalBuckets { get; init; }
-
 	[JsonInclude, JsonPropertyName("values_fetched")]
 	public int? ValuesFetched { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfileDelegateDebugFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfileDelegateDebugFilter.g.cs
index 352b1c753ef..b46c65672af 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfileDelegateDebugFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/AggregationProfileDelegateDebugFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class AggregationProfileDelegateDebugFilter
 {
 	[JsonInclude, JsonPropertyName("query")]
 	public string? Query { get; init; }
-
 	[JsonInclude, JsonPropertyName("results_from_metadata")]
 	public int? ResultsFromMetadata { get; init; }
-
 	[JsonInclude, JsonPropertyName("segments_counted_in_constant_time")]
 	public int? SegmentsCountedInConstantTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("specialized_for")]
 	public string? SpecializedFor { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Collector.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Collector.g.cs
index 25d0f09344e..e206059116b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Collector.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Collector.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class Collector
 {
 	[JsonInclude, JsonPropertyName("children")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.Collector>? Children { get; init; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-
 	[JsonInclude, JsonPropertyName("reason")]
 	public string Reason { get; init; }
-
 	[JsonInclude, JsonPropertyName("time_in_nanos")]
 	public long TimeInNanos { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionContext.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionContext.g.cs
index 0f0b4f7465a..d52290eaa4b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionContext.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionContext.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class CompletionContext
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("context")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Context Context { get; set; }
-
 	[JsonInclude, JsonPropertyName("neighbours")]
 	public ICollection<Elastic.Clients.Elasticsearch.GeoHashPrecision>? Neighbours { get; set; }
-
 	[JsonInclude, JsonPropertyName("precision")]
 	public Elastic.Clients.Elasticsearch.GeoHashPrecision? Precision { get; set; }
-
 	[JsonInclude, JsonPropertyName("prefix")]
 	public bool? Prefix { get; set; }
 }
@@ -46,18 +44,15 @@ public sealed partial class CompletionContext
 public sealed partial class CompletionContextDescriptor : SerializableDescriptor<CompletionContextDescriptor>
 {
 	internal CompletionContextDescriptor(Action<CompletionContextDescriptor> configure) => configure.Invoke(this);
+
 	public CompletionContextDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Context ContextValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.GeoHashPrecision>? NeighboursValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoHashPrecision? PrecisionValue { get; set; }
-
 	private bool? PrefixValue { get; set; }
 
 	public CompletionContextDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggester.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggester.g.cs
index b9a5ccedf6d..a809ad0f139 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggester.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggester.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class CompletionSuggester
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("contexts")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, ICollection<Elastic.Clients.Elasticsearch.Core.Search.CompletionContext>>? Contexts { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzzy")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SuggestFuzziness? Fuzzy { get; set; }
-
 	[JsonInclude, JsonPropertyName("prefix")]
 	public string? Prefix { get; set; }
-
 	[JsonInclude, JsonPropertyName("regex")]
 	public string? Regex { get; set; }
-
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
-
 	[JsonInclude, JsonPropertyName("skip_duplicates")]
 	public bool? SkipDuplicates { get; set; }
 
@@ -57,28 +52,20 @@ public sealed partial class CompletionSuggester
 public sealed partial class CompletionSuggesterDescriptor<TDocument> : SerializableDescriptor<CompletionSuggesterDescriptor<TDocument>>
 {
 	internal CompletionSuggesterDescriptor(Action<CompletionSuggesterDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CompletionSuggesterDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, ICollection<Elastic.Clients.Elasticsearch.Core.Search.CompletionContext>>? ContextsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SuggestFuzziness? FuzzyValue { get; set; }
-
 	private SuggestFuzzinessDescriptor FuzzyDescriptor { get; set; }
-
 	private Action<SuggestFuzzinessDescriptor> FuzzyDescriptorAction { get; set; }
-
 	private string? PrefixValue { get; set; }
-
 	private string? RegexValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private bool? SkipDuplicatesValue { get; set; }
 
 	public CompletionSuggesterDescriptor<TDocument> Analyzer(string? analyzer)
@@ -217,28 +204,20 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class CompletionSuggesterDescriptor : SerializableDescriptor<CompletionSuggesterDescriptor>
 {
 	internal CompletionSuggesterDescriptor(Action<CompletionSuggesterDescriptor> configure) => configure.Invoke(this);
+
 	public CompletionSuggesterDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, ICollection<Elastic.Clients.Elasticsearch.Core.Search.CompletionContext>>? ContextsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SuggestFuzziness? FuzzyValue { get; set; }
-
 	private SuggestFuzzinessDescriptor FuzzyDescriptor { get; set; }
-
 	private Action<SuggestFuzzinessDescriptor> FuzzyDescriptorAction { get; set; }
-
 	private string? PrefixValue { get; set; }
-
 	private string? RegexValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private bool? SkipDuplicatesValue { get; set; }
 
 	public CompletionSuggesterDescriptor Analyzer(string? analyzer)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/DirectGenerator.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/DirectGenerator.g.cs
index dd5e8c79704..7af7c6588f7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/DirectGenerator.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/DirectGenerator.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,40 +25,30 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class DirectGenerator
 {
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_edits")]
 	public int? MaxEdits { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_inspections")]
 	public float? MaxInspections { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_term_freq")]
 	public float? MaxTermFreq { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_doc_freq")]
 	public float? MinDocFreq { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_word_length")]
 	public int? MinWordLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("post_filter")]
 	public string? PostFilter { get; set; }
-
 	[JsonInclude, JsonPropertyName("pre_filter")]
 	public string? PreFilter { get; set; }
-
 	[JsonInclude, JsonPropertyName("prefix_length")]
 	public int? PrefixLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
-
 	[JsonInclude, JsonPropertyName("suggest_mode")]
 	public Elastic.Clients.Elasticsearch.SuggestMode? SuggestMode { get; set; }
 }
@@ -64,30 +56,21 @@ public sealed partial class DirectGenerator
 public sealed partial class DirectGeneratorDescriptor<TDocument> : SerializableDescriptor<DirectGeneratorDescriptor<TDocument>>
 {
 	internal DirectGeneratorDescriptor(Action<DirectGeneratorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DirectGeneratorDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private int? MaxEditsValue { get; set; }
-
 	private float? MaxInspectionsValue { get; set; }
-
 	private float? MaxTermFreqValue { get; set; }
-
 	private float? MinDocFreqValue { get; set; }
-
 	private int? MinWordLengthValue { get; set; }
-
 	private string? PostFilterValue { get; set; }
-
 	private string? PreFilterValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SuggestMode? SuggestModeValue { get; set; }
 
 	public DirectGeneratorDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field field)
@@ -234,30 +217,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DirectGeneratorDescriptor : SerializableDescriptor<DirectGeneratorDescriptor>
 {
 	internal DirectGeneratorDescriptor(Action<DirectGeneratorDescriptor> configure) => configure.Invoke(this);
+
 	public DirectGeneratorDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private int? MaxEditsValue { get; set; }
-
 	private float? MaxInspectionsValue { get; set; }
-
 	private float? MaxTermFreqValue { get; set; }
-
 	private float? MinDocFreqValue { get; set; }
-
 	private int? MinWordLengthValue { get; set; }
-
 	private string? PostFilterValue { get; set; }
-
 	private string? PreFilterValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SuggestMode? SuggestModeValue { get; set; }
 
 	public DirectGeneratorDescriptor Field(Elastic.Clients.Elasticsearch.Field field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfile.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfile.g.cs
index 72ef4001d8a..2203d2c987f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfile.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfile.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class FetchProfile
 {
 	[JsonInclude, JsonPropertyName("breakdown")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FetchProfileBreakdown Breakdown { get; init; }
-
 	[JsonInclude, JsonPropertyName("children")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.FetchProfile>? Children { get; init; }
-
 	[JsonInclude, JsonPropertyName("debug")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FetchProfileDebug? Debug { get; init; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-
 	[JsonInclude, JsonPropertyName("time_in_nanos")]
 	public long TimeInNanos { get; init; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfileBreakdown.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfileBreakdown.g.cs
index 19b1dad1e45..b22ce9e3dee 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfileBreakdown.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfileBreakdown.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class FetchProfileBreakdown
 {
 	[JsonInclude, JsonPropertyName("load_source")]
 	public int? LoadSource { get; init; }
-
 	[JsonInclude, JsonPropertyName("load_source_count")]
 	public int? LoadSourceCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("load_stored_fields")]
 	public int? LoadStoredFields { get; init; }
-
 	[JsonInclude, JsonPropertyName("load_stored_fields_count")]
 	public int? LoadStoredFieldsCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("next_reader")]
 	public int? NextReader { get; init; }
-
 	[JsonInclude, JsonPropertyName("next_reader_count")]
 	public int? NextReaderCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("process")]
 	public int? Process { get; init; }
-
 	[JsonInclude, JsonPropertyName("process_count")]
 	public int? ProcessCount { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfileDebug.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfileDebug.g.cs
index a1feee6a13b..e16c777e3ac 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfileDebug.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FetchProfileDebug.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class FetchProfileDebug
 {
 	[JsonInclude, JsonPropertyName("fast_path")]
 	public int? FastPath { get; init; }
-
 	[JsonInclude, JsonPropertyName("stored_fields")]
 	public IReadOnlyCollection<string>? StoredFields { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldCollapse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldCollapse.g.cs
index de2e45776bc..779fb77acf9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldCollapse.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldCollapse.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class FieldCollapse
 {
 	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? Collapse { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("inner_hits"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.Core.Search.InnerHits))]
 	public ICollection<Elastic.Clients.Elasticsearch.Core.Search.InnerHits>? InnerHits { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_concurrent_group_searches")]
 	public int? MaxConcurrentGroupSearches { get; set; }
 }
@@ -43,26 +42,19 @@ public sealed partial class FieldCollapse
 public sealed partial class FieldCollapseDescriptor<TDocument> : SerializableDescriptor<FieldCollapseDescriptor<TDocument>>
 {
 	internal FieldCollapseDescriptor(Action<FieldCollapseDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FieldCollapseDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; }
-
 	private FieldCollapseDescriptor<TDocument> CollapseDescriptor { get; set; }
-
 	private Action<FieldCollapseDescriptor<TDocument>> CollapseDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Core.Search.InnerHits>? InnerHitsValue { get; set; }
-
 	private InnerHitsDescriptor<TDocument> InnerHitsDescriptor { get; set; }
-
 	private Action<InnerHitsDescriptor<TDocument>> InnerHitsDescriptorAction { get; set; }
-
 	private Action<InnerHitsDescriptor<TDocument>>[] InnerHitsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private int? MaxConcurrentGroupSearchesValue { get; set; }
 
 	public FieldCollapseDescriptor<TDocument> Collapse(Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? collapse)
@@ -206,26 +198,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FieldCollapseDescriptor : SerializableDescriptor<FieldCollapseDescriptor>
 {
 	internal FieldCollapseDescriptor(Action<FieldCollapseDescriptor> configure) => configure.Invoke(this);
+
 	public FieldCollapseDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; }
-
 	private FieldCollapseDescriptor CollapseDescriptor { get; set; }
-
 	private Action<FieldCollapseDescriptor> CollapseDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Core.Search.InnerHits>? InnerHitsValue { get; set; }
-
 	private InnerHitsDescriptor InnerHitsDescriptor { get; set; }
-
 	private Action<InnerHitsDescriptor> InnerHitsDescriptorAction { get; set; }
-
 	private Action<InnerHitsDescriptor>[] InnerHitsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private int? MaxConcurrentGroupSearchesValue { get; set; }
 
 	public FieldCollapseDescriptor Collapse(Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? collapse)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs
index 48f8880def1..10a4d5fe7e0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 [JsonConverter(typeof(FieldSuggesterConverter))]
 public sealed partial class FieldSuggester
 {
@@ -41,18 +43,16 @@ internal FieldSuggester(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static FieldSuggester Completion(Elastic.Clients.Elasticsearch.Core.Search.CompletionSuggester completionSuggester) => new FieldSuggester("completion", completionSuggester);
 	public static FieldSuggester Phrase(Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggester phraseSuggester) => new FieldSuggester("phrase", phraseSuggester);
 	public static FieldSuggester Term(Elastic.Clients.Elasticsearch.Core.Search.TermSuggester termSuggester) => new FieldSuggester("term", termSuggester);
+
 	[JsonInclude, JsonPropertyName("prefix")]
 	public string? Prefix { get; set; }
-
 	[JsonInclude, JsonPropertyName("regex")]
 	public string? Regex { get; set; }
-
 	[JsonInclude, JsonPropertyName("text")]
 	public string? Text { get; set; }
 }
@@ -177,20 +177,17 @@ public override void Write(Utf8JsonWriter writer, FieldSuggester value, JsonSeri
 public sealed partial class FieldSuggesterDescriptor<TDocument> : SerializableDescriptor<FieldSuggesterDescriptor<TDocument>>
 {
 	internal FieldSuggesterDescriptor(Action<FieldSuggesterDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FieldSuggesterDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private FieldSuggesterDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private FieldSuggesterDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -209,9 +206,7 @@ private FieldSuggesterDescriptor<TDocument> Set(object variant, string variantNa
 	}
 
 	private string? PrefixValue { get; set; }
-
 	private string? RegexValue { get; set; }
-
 	private string? TextValue { get; set; }
 
 	public FieldSuggesterDescriptor<TDocument> Prefix(string? prefix)
@@ -238,6 +233,7 @@ public FieldSuggesterDescriptor<TDocument> Text(string? text)
 	public FieldSuggesterDescriptor<TDocument> Phrase(Action<PhraseSuggesterDescriptor<TDocument>> configure) => Set(configure, "phrase");
 	public FieldSuggesterDescriptor<TDocument> Term(TermSuggester termSuggester) => Set(termSuggester, "term");
 	public FieldSuggesterDescriptor<TDocument> Term(Action<TermSuggesterDescriptor<TDocument>> configure) => Set(configure, "term");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -281,20 +277,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FieldSuggesterDescriptor : SerializableDescriptor<FieldSuggesterDescriptor>
 {
 	internal FieldSuggesterDescriptor(Action<FieldSuggesterDescriptor> configure) => configure.Invoke(this);
+
 	public FieldSuggesterDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private FieldSuggesterDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private FieldSuggesterDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -313,9 +306,7 @@ private FieldSuggesterDescriptor Set(object variant, string variantName)
 	}
 
 	private string? PrefixValue { get; set; }
-
 	private string? RegexValue { get; set; }
-
 	private string? TextValue { get; set; }
 
 	public FieldSuggesterDescriptor Prefix(string? prefix)
@@ -345,6 +336,7 @@ public FieldSuggesterDescriptor Text(string? text)
 	public FieldSuggesterDescriptor Term(TermSuggester termSuggester) => Set(termSuggester, "term");
 	public FieldSuggesterDescriptor Term(Action<TermSuggesterDescriptor> configure) => Set(configure, "term");
 	public FieldSuggesterDescriptor Term<TDocument>(Action<TermSuggesterDescriptor<TDocument>> configure) => Set(configure, "term");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Highlight.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Highlight.g.cs
index 950e7f62e5b..9d01f5136ba 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Highlight.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Highlight.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,76 +25,54 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class Highlight
 {
 	[JsonInclude, JsonPropertyName("boundary_chars")]
 	public string? BoundaryChars { get; set; }
-
 	[JsonInclude, JsonPropertyName("boundary_max_scan")]
 	public int? BoundaryMaxScan { get; set; }
-
 	[JsonInclude, JsonPropertyName("boundary_scanner")]
 	public Elastic.Clients.Elasticsearch.Core.Search.BoundaryScanner? BoundaryScanner { get; set; }
-
 	[JsonInclude, JsonPropertyName("boundary_scanner_locale")]
 	public string? BoundaryScannerLocale { get; set; }
-
 	[JsonInclude, JsonPropertyName("encoder")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HighlighterEncoder? Encoder { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Core.Search.HighlightField> Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("force_source")]
 	public bool? ForceSource { get; set; }
-
 	[JsonInclude, JsonPropertyName("fragment_size")]
 	public int? FragmentSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("fragmenter")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HighlighterFragmenter? Fragmenter { get; set; }
-
 	[JsonInclude, JsonPropertyName("highlight_filter")]
 	public bool? HighlightFilter { get; set; }
-
 	[JsonInclude, JsonPropertyName("highlight_query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQuery { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_analyzed_offset")]
 	public int? MaxAnalyzedOffset { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_fragment_length")]
 	public int? MaxFragmentLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("no_match_size")]
 	public int? NoMatchSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("number_of_fragments")]
 	public int? NumberOfFragments { get; set; }
-
 	[JsonInclude, JsonPropertyName("options")]
 	public IDictionary<string, object>? Options { get; set; }
-
 	[JsonInclude, JsonPropertyName("order")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HighlighterOrder? Order { get; set; }
-
 	[JsonInclude, JsonPropertyName("phrase_limit")]
 	public int? PhraseLimit { get; set; }
-
 	[JsonInclude, JsonPropertyName("post_tags")]
 	public ICollection<string>? PostTags { get; set; }
-
 	[JsonInclude, JsonPropertyName("pre_tags")]
 	public ICollection<string>? PreTags { get; set; }
-
 	[JsonInclude, JsonPropertyName("require_field_match")]
 	public bool? RequireFieldMatch { get; set; }
-
 	[JsonInclude, JsonPropertyName("tags_schema")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HighlighterTagsSchema? TagsSchema { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HighlighterType? Type { get; set; }
 }
@@ -100,58 +80,35 @@ public sealed partial class Highlight
 public sealed partial class HighlightDescriptor<TDocument> : SerializableDescriptor<HighlightDescriptor<TDocument>>
 {
 	internal HighlightDescriptor(Action<HighlightDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public HighlightDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> HighlightQueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> HighlightQueryDescriptorAction { get; set; }
-
 	private string? BoundaryCharsValue { get; set; }
-
 	private int? BoundaryMaxScanValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.BoundaryScanner? BoundaryScannerValue { get; set; }
-
 	private string? BoundaryScannerLocaleValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterEncoder? EncoderValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Core.Search.HighlightField> FieldsValue { get; set; }
-
 	private bool? ForceSourceValue { get; set; }
-
 	private int? FragmentSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterFragmenter? FragmenterValue { get; set; }
-
 	private bool? HighlightFilterValue { get; set; }
-
 	private int? MaxAnalyzedOffsetValue { get; set; }
-
 	private int? MaxFragmentLengthValue { get; set; }
-
 	private int? NoMatchSizeValue { get; set; }
-
 	private int? NumberOfFragmentsValue { get; set; }
-
 	private IDictionary<string, object>? OptionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterOrder? OrderValue { get; set; }
-
 	private int? PhraseLimitValue { get; set; }
-
 	private ICollection<string>? PostTagsValue { get; set; }
-
 	private ICollection<string>? PreTagsValue { get; set; }
-
 	private bool? RequireFieldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterTagsSchema? TagsSchemaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterType? TypeValue { get; set; }
 
 	public HighlightDescriptor<TDocument> HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.Query? highlightQuery)
@@ -464,58 +421,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class HighlightDescriptor : SerializableDescriptor<HighlightDescriptor>
 {
 	internal HighlightDescriptor(Action<HighlightDescriptor> configure) => configure.Invoke(this);
+
 	public HighlightDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor HighlightQueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> HighlightQueryDescriptorAction { get; set; }
-
 	private string? BoundaryCharsValue { get; set; }
-
 	private int? BoundaryMaxScanValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.BoundaryScanner? BoundaryScannerValue { get; set; }
-
 	private string? BoundaryScannerLocaleValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterEncoder? EncoderValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.Core.Search.HighlightField> FieldsValue { get; set; }
-
 	private bool? ForceSourceValue { get; set; }
-
 	private int? FragmentSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterFragmenter? FragmenterValue { get; set; }
-
 	private bool? HighlightFilterValue { get; set; }
-
 	private int? MaxAnalyzedOffsetValue { get; set; }
-
 	private int? MaxFragmentLengthValue { get; set; }
-
 	private int? NoMatchSizeValue { get; set; }
-
 	private int? NumberOfFragmentsValue { get; set; }
-
 	private IDictionary<string, object>? OptionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterOrder? OrderValue { get; set; }
-
 	private int? PhraseLimitValue { get; set; }
-
 	private ICollection<string>? PostTagsValue { get; set; }
-
 	private ICollection<string>? PreTagsValue { get; set; }
-
 	private bool? RequireFieldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterTagsSchema? TagsSchemaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterType? TypeValue { get; set; }
 
 	public HighlightDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.Query? highlightQuery)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HighlightField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HighlightField.g.cs
index f142398f5d2..7d72aa94a32 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HighlightField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HighlightField.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,79 +25,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class HighlightField
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public Elastic.Clients.Elasticsearch.Analysis.Analyzers? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("boundary_chars")]
 	public string? BoundaryChars { get; set; }
-
 	[JsonInclude, JsonPropertyName("boundary_max_scan")]
 	public int? BoundaryMaxScan { get; set; }
-
 	[JsonInclude, JsonPropertyName("boundary_scanner")]
 	public Elastic.Clients.Elasticsearch.Core.Search.BoundaryScanner? BoundaryScanner { get; set; }
-
 	[JsonInclude, JsonPropertyName("boundary_scanner_locale")]
 	public string? BoundaryScannerLocale { get; set; }
-
 	[JsonInclude, JsonPropertyName("force_source")]
 	public bool? ForceSource { get; set; }
-
 	[JsonInclude, JsonPropertyName("fragment_offset")]
 	public int? FragmentOffset { get; set; }
-
 	[JsonInclude, JsonPropertyName("fragment_size")]
 	public int? FragmentSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("fragmenter")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HighlighterFragmenter? Fragmenter { get; set; }
-
 	[JsonInclude, JsonPropertyName("highlight_filter")]
 	public bool? HighlightFilter { get; set; }
-
 	[JsonInclude, JsonPropertyName("highlight_query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQuery { get; set; }
-
 	[JsonInclude, JsonPropertyName("matched_fields")]
 	public Elastic.Clients.Elasticsearch.Fields? MatchedFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_analyzed_offset")]
 	public int? MaxAnalyzedOffset { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_fragment_length")]
 	public int? MaxFragmentLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("no_match_size")]
 	public int? NoMatchSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("number_of_fragments")]
 	public int? NumberOfFragments { get; set; }
-
 	[JsonInclude, JsonPropertyName("options")]
 	public IDictionary<string, object>? Options { get; set; }
-
 	[JsonInclude, JsonPropertyName("order")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HighlighterOrder? Order { get; set; }
-
 	[JsonInclude, JsonPropertyName("phrase_limit")]
 	public int? PhraseLimit { get; set; }
-
 	[JsonInclude, JsonPropertyName("post_tags")]
 	public ICollection<string>? PostTags { get; set; }
-
 	[JsonInclude, JsonPropertyName("pre_tags")]
 	public ICollection<string>? PreTags { get; set; }
-
 	[JsonInclude, JsonPropertyName("require_field_match")]
 	public bool? RequireFieldMatch { get; set; }
-
 	[JsonInclude, JsonPropertyName("tags_schema")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HighlighterTagsSchema? TagsSchema { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.Core.Search.HighlighterType? Type { get; set; }
 }
@@ -103,60 +82,36 @@ public sealed partial class HighlightField
 public sealed partial class HighlightFieldDescriptor<TDocument> : SerializableDescriptor<HighlightFieldDescriptor<TDocument>>
 {
 	internal HighlightFieldDescriptor(Action<HighlightFieldDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public HighlightFieldDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> HighlightQueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> HighlightQueryDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.Analyzers? AnalyzerValue { get; set; }
-
 	private string? BoundaryCharsValue { get; set; }
-
 	private int? BoundaryMaxScanValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.BoundaryScanner? BoundaryScannerValue { get; set; }
-
 	private string? BoundaryScannerLocaleValue { get; set; }
-
 	private bool? ForceSourceValue { get; set; }
-
 	private int? FragmentOffsetValue { get; set; }
-
 	private int? FragmentSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterFragmenter? FragmenterValue { get; set; }
-
 	private bool? HighlightFilterValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? MatchedFieldsValue { get; set; }
-
 	private int? MaxAnalyzedOffsetValue { get; set; }
-
 	private int? MaxFragmentLengthValue { get; set; }
-
 	private int? NoMatchSizeValue { get; set; }
-
 	private int? NumberOfFragmentsValue { get; set; }
-
 	private IDictionary<string, object>? OptionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterOrder? OrderValue { get; set; }
-
 	private int? PhraseLimitValue { get; set; }
-
 	private ICollection<string>? PostTagsValue { get; set; }
-
 	private ICollection<string>? PreTagsValue { get; set; }
-
 	private bool? RequireFieldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterTagsSchema? TagsSchemaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterType? TypeValue { get; set; }
 
 	public HighlightFieldDescriptor<TDocument> HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.Query? highlightQuery)
@@ -485,60 +440,36 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class HighlightFieldDescriptor : SerializableDescriptor<HighlightFieldDescriptor>
 {
 	internal HighlightFieldDescriptor(Action<HighlightFieldDescriptor> configure) => configure.Invoke(this);
+
 	public HighlightFieldDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? HighlightQueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor HighlightQueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> HighlightQueryDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.Analyzers? AnalyzerValue { get; set; }
-
 	private string? BoundaryCharsValue { get; set; }
-
 	private int? BoundaryMaxScanValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.BoundaryScanner? BoundaryScannerValue { get; set; }
-
 	private string? BoundaryScannerLocaleValue { get; set; }
-
 	private bool? ForceSourceValue { get; set; }
-
 	private int? FragmentOffsetValue { get; set; }
-
 	private int? FragmentSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterFragmenter? FragmenterValue { get; set; }
-
 	private bool? HighlightFilterValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? MatchedFieldsValue { get; set; }
-
 	private int? MaxAnalyzedOffsetValue { get; set; }
-
 	private int? MaxFragmentLengthValue { get; set; }
-
 	private int? NoMatchSizeValue { get; set; }
-
 	private int? NumberOfFragmentsValue { get; set; }
-
 	private IDictionary<string, object>? OptionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterOrder? OrderValue { get; set; }
-
 	private int? PhraseLimitValue { get; set; }
-
 	private ICollection<string>? PostTagsValue { get; set; }
-
 	private ICollection<string>? PreTagsValue { get; set; }
-
 	private bool? RequireFieldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterTagsSchema? TagsSchemaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.HighlighterType? TypeValue { get; set; }
 
 	public HighlightFieldDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.Query? highlightQuery)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Hit.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Hit.g.cs
index 9279c6ade6f..62955edaddf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Hit.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Hit.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,65 +25,47 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class Hit<TDocument>
 {
 	[JsonInclude, JsonPropertyName("_explanation")]
 	public Elastic.Clients.Elasticsearch.Core.Explain.Explanation? Explanation { get; init; }
-
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("_ignored")]
 	public IReadOnlyCollection<string>? Ignored { get; init; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("_nested")]
 	public Elastic.Clients.Elasticsearch.Core.Search.NestedIdentity? Nested { get; init; }
-
 	[JsonInclude, JsonPropertyName("_node")]
 	public string? Node { get; init; }
-
 	[JsonInclude, JsonPropertyName("_primary_term")]
 	public long? PrimaryTerm { get; init; }
-
 	[JsonInclude, JsonPropertyName("_routing")]
 	public string? Routing { get; init; }
-
 	[JsonInclude, JsonPropertyName("_score")]
 	public double? Score { get; init; }
-
 	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long? SeqNo { get; init; }
-
 	[JsonInclude, JsonPropertyName("_shard")]
 	public string? Shard { get; init; }
-
 	[JsonInclude, JsonPropertyName("_source")]
 	[SourceConverter]
 	public TDocument? Source { get; init; }
-
 	[JsonInclude, JsonPropertyName("_version")]
 	public long? Version { get; init; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("highlight")]
 	public IReadOnlyDictionary<string, IReadOnlyCollection<string>>? Highlight { get; init; }
-
 	[JsonInclude, JsonPropertyName("ignored_field_values")]
 	public IReadOnlyDictionary<string, IReadOnlyCollection<string>>? IgnoredFieldValues { get; init; }
-
 	[JsonInclude, JsonPropertyName("inner_hits")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Core.Search.InnerHitsResult>? InnerHits { get; init; }
-
 	[JsonInclude, JsonPropertyName("matched_queries")]
 	public IReadOnlyCollection<string>? MatchedQueries { get; init; }
-
 	[JsonInclude, JsonPropertyName("sort")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>? Sort { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HitsMetadata.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HitsMetadata.g.cs
index 0f316a99ff1..c9b097e69f6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HitsMetadata.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/HitsMetadata.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class HitsMetadata<T>
 {
 	[JsonInclude, JsonPropertyName("hits")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.Hit<T>> Hits { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_score")]
 	public double? MaxScore { get; init; }
 
+	/// <summary>
+	/// <para>Total hit count information, present only if `track_total_hits` wasn't `false` in the search request.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("total")]
 	public Elastic.Clients.Elasticsearch.Core.Search.TotalHits? Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHits.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHits.g.cs
index cf731f23463..a1ff35dc40b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHits.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHits.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,55 +25,40 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class InnerHits
 {
 	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? Source { get; set; }
-
 	[JsonInclude, JsonPropertyName("collapse")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? Collapse { get; set; }
-
 	[JsonInclude, JsonPropertyName("docvalue_fields")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("explain")]
 	public bool? Explain { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("from")]
 	public int? From { get; set; }
-
 	[JsonInclude, JsonPropertyName("highlight")]
 	public Elastic.Clients.Elasticsearch.Core.Search.Highlight? Highlight { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_unmapped")]
 	public bool? IgnoreUnmapped { get; set; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public Elastic.Clients.Elasticsearch.Name? Name { get; set; }
-
 	[JsonInclude, JsonPropertyName("script_fields")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("seq_no_primary_term")]
 	public bool? SeqNoPrimaryTerm { get; set; }
-
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
-
 	[JsonInclude, JsonPropertyName("sort"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.SortOptions))]
 	public ICollection<Elastic.Clients.Elasticsearch.SortOptions>? Sort { get; set; }
-
 	[JsonInclude, JsonPropertyName("stored_field")]
 	public Elastic.Clients.Elasticsearch.Fields? StoredField { get; set; }
-
 	[JsonInclude, JsonPropertyName("track_scores")]
 	public bool? TrackScores { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public bool? Version { get; set; }
 }
@@ -79,60 +66,36 @@ public sealed partial class InnerHits
 public sealed partial class InnerHitsDescriptor<TDocument> : SerializableDescriptor<InnerHitsDescriptor<TDocument>>
 {
 	internal InnerHitsDescriptor(Action<InnerHitsDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public InnerHitsDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; }
-
 	private FieldCollapseDescriptor<TDocument> CollapseDescriptor { get; set; }
-
 	private Action<FieldCollapseDescriptor<TDocument>> CollapseDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor<TDocument> DocvalueFieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>> DocvalueFieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor<TDocument>>[] DocvalueFieldsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Highlight? HighlightValue { get; set; }
-
 	private HighlightDescriptor<TDocument> HighlightDescriptor { get; set; }
-
 	private Action<HighlightDescriptor<TDocument>> HighlightDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor<TDocument> SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor<TDocument>>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private bool? ExplainValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? FieldsValue { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Name? NameValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFieldsValue { get; set; }
-
 	private bool? SeqNoPrimaryTermValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? StoredFieldValue { get; set; }
-
 	private bool? TrackScoresValue { get; set; }
-
 	private bool? VersionValue { get; set; }
 
 	public InnerHitsDescriptor<TDocument> Collapse(Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? collapse)
@@ -501,60 +464,36 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class InnerHitsDescriptor : SerializableDescriptor<InnerHitsDescriptor>
 {
 	internal InnerHitsDescriptor(Action<InnerHitsDescriptor> configure) => configure.Invoke(this);
+
 	public InnerHitsDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? CollapseValue { get; set; }
-
 	private FieldCollapseDescriptor CollapseDescriptor { get; set; }
-
 	private Action<FieldCollapseDescriptor> CollapseDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FieldAndFormat>? DocvalueFieldsValue { get; set; }
-
 	private QueryDsl.FieldAndFormatDescriptor DocvalueFieldsDescriptor { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor> DocvalueFieldsDescriptorAction { get; set; }
-
 	private Action<QueryDsl.FieldAndFormatDescriptor>[] DocvalueFieldsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.Highlight? HighlightValue { get; set; }
-
 	private HighlightDescriptor HighlightDescriptor { get; set; }
-
 	private Action<HighlightDescriptor> HighlightDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.SortOptions>? SortValue { get; set; }
-
 	private SortOptionsDescriptor SortDescriptor { get; set; }
-
 	private Action<SortOptionsDescriptor> SortDescriptorAction { get; set; }
-
 	private Action<SortOptionsDescriptor>[] SortDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; }
-
 	private bool? ExplainValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? FieldsValue { get; set; }
-
 	private int? FromValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Name? NameValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.ScriptField>? ScriptFieldsValue { get; set; }
-
 	private bool? SeqNoPrimaryTermValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? StoredFieldValue { get; set; }
-
 	private bool? TrackScoresValue { get; set; }
-
 	private bool? VersionValue { get; set; }
 
 	public InnerHitsDescriptor Collapse(Elastic.Clients.Elasticsearch.Core.Search.FieldCollapse? collapse)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHitsResult.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHitsResult.g.cs
index 8907ec3a5a4..7f7f75b7a92 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHitsResult.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHitsResult.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class InnerHitsResult
 {
 	[JsonInclude, JsonPropertyName("hits")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LaplaceSmoothingModel.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LaplaceSmoothingModel.g.cs
index 304a1065876..80308ad0dfc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LaplaceSmoothingModel.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LaplaceSmoothingModel.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class LaplaceSmoothingModel
 {
 	[JsonInclude, JsonPropertyName("alpha")]
@@ -36,6 +38,7 @@ public sealed partial class LaplaceSmoothingModel
 public sealed partial class LaplaceSmoothingModelDescriptor : SerializableDescriptor<LaplaceSmoothingModelDescriptor>
 {
 	internal LaplaceSmoothingModelDescriptor(Action<LaplaceSmoothingModelDescriptor> configure) => configure.Invoke(this);
+
 	public LaplaceSmoothingModelDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LinearInterpolationSmoothingModel.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LinearInterpolationSmoothingModel.g.cs
index bc75303f860..e20a03f1d05 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LinearInterpolationSmoothingModel.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/LinearInterpolationSmoothingModel.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class LinearInterpolationSmoothingModel
 {
 	[JsonInclude, JsonPropertyName("bigram_lambda")]
 	public double BigramLambda { get; set; }
-
 	[JsonInclude, JsonPropertyName("trigram_lambda")]
 	public double TrigramLambda { get; set; }
-
 	[JsonInclude, JsonPropertyName("unigram_lambda")]
 	public double UnigramLambda { get; set; }
 
@@ -42,14 +42,13 @@ public sealed partial class LinearInterpolationSmoothingModel
 public sealed partial class LinearInterpolationSmoothingModelDescriptor : SerializableDescriptor<LinearInterpolationSmoothingModelDescriptor>
 {
 	internal LinearInterpolationSmoothingModelDescriptor(Action<LinearInterpolationSmoothingModelDescriptor> configure) => configure.Invoke(this);
+
 	public LinearInterpolationSmoothingModelDescriptor() : base()
 	{
 	}
 
 	private double BigramLambdaValue { get; set; }
-
 	private double TrigramLambdaValue { get; set; }
-
 	private double UnigramLambdaValue { get; set; }
 
 	public LinearInterpolationSmoothingModelDescriptor BigramLambda(double bigramLambda)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/NestedIdentity.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/NestedIdentity.g.cs
index 700dce9658e..eda9147767c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/NestedIdentity.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/NestedIdentity.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class NestedIdentity
 {
 	[JsonInclude, JsonPropertyName("_nested")]
 	public Elastic.Clients.Elasticsearch.Core.Search.NestedIdentity? Nested { get; init; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public string Field { get; init; }
-
 	[JsonInclude, JsonPropertyName("offset")]
 	public int Offset { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestCollate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestCollate.g.cs
index 8e7340f9dd3..235d0d2c718 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestCollate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestCollate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class PhraseSuggestCollate
 {
 	[JsonInclude, JsonPropertyName("params")]
 	public IDictionary<string, object>? Params { get; set; }
-
 	[JsonInclude, JsonPropertyName("prune")]
 	public bool? Prune { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestCollateQuery Query { get; set; }
 }
@@ -40,18 +40,15 @@ public sealed partial class PhraseSuggestCollate
 public sealed partial class PhraseSuggestCollateDescriptor : SerializableDescriptor<PhraseSuggestCollateDescriptor>
 {
 	internal PhraseSuggestCollateDescriptor(Action<PhraseSuggestCollateDescriptor> configure) => configure.Invoke(this);
+
 	public PhraseSuggestCollateDescriptor() : base()
 	{
 	}
 
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private bool? PruneValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestCollateQuery QueryValue { get; set; }
-
 	private PhraseSuggestCollateQueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<PhraseSuggestCollateQueryDescriptor> QueryDescriptorAction { get; set; }
 
 	public PhraseSuggestCollateDescriptor Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> selector)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestCollateQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestCollateQuery.g.cs
index 20365f81725..3be00672707 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestCollateQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestCollateQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class PhraseSuggestCollateQuery
 {
 	[JsonInclude, JsonPropertyName("id")]
 	public Elastic.Clients.Elasticsearch.Id? Id { get; set; }
-
 	[JsonInclude, JsonPropertyName("source")]
 	public string? Source { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class PhraseSuggestCollateQuery
 public sealed partial class PhraseSuggestCollateQueryDescriptor : SerializableDescriptor<PhraseSuggestCollateQueryDescriptor>
 {
 	internal PhraseSuggestCollateQueryDescriptor(Action<PhraseSuggestCollateQueryDescriptor> configure) => configure.Invoke(this);
+
 	public PhraseSuggestCollateQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Id? IdValue { get; set; }
-
 	private string? SourceValue { get; set; }
 
 	public PhraseSuggestCollateQueryDescriptor Id(Elastic.Clients.Elasticsearch.Id? id)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestHighlight.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestHighlight.g.cs
index e471cddd54d..28bf1da5336 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestHighlight.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggestHighlight.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class PhraseSuggestHighlight
 {
 	[JsonInclude, JsonPropertyName("post_tag")]
 	public string PostTag { get; set; }
-
 	[JsonInclude, JsonPropertyName("pre_tag")]
 	public string PreTag { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class PhraseSuggestHighlight
 public sealed partial class PhraseSuggestHighlightDescriptor : SerializableDescriptor<PhraseSuggestHighlightDescriptor>
 {
 	internal PhraseSuggestHighlightDescriptor(Action<PhraseSuggestHighlightDescriptor> configure) => configure.Invoke(this);
+
 	public PhraseSuggestHighlightDescriptor() : base()
 	{
 	}
 
 	private string PostTagValue { get; set; }
-
 	private string PreTagValue { get; set; }
 
 	public PhraseSuggestHighlightDescriptor PostTag(string postTag)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggester.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggester.g.cs
index c9f1978e582..b368d42d05f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggester.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PhraseSuggester.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,55 +25,40 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class PhraseSuggester
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("collate")]
 	public Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestCollate? Collate { get; set; }
-
 	[JsonInclude, JsonPropertyName("confidence")]
 	public double? Confidence { get; set; }
-
 	[JsonInclude, JsonPropertyName("direct_generator")]
 	public ICollection<Elastic.Clients.Elasticsearch.Core.Search.DirectGenerator>? DirectGenerator { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("force_unigrams")]
 	public bool? ForceUnigrams { get; set; }
-
 	[JsonInclude, JsonPropertyName("gram_size")]
 	public int? GramSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("highlight")]
 	public Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestHighlight? Highlight { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_errors")]
 	public double? MaxErrors { get; set; }
-
 	[JsonInclude, JsonPropertyName("real_word_error_likelihood")]
 	public double? RealWordErrorLikelihood { get; set; }
-
 	[JsonInclude, JsonPropertyName("separator")]
 	public string? Separator { get; set; }
-
 	[JsonInclude, JsonPropertyName("shard_size")]
 	public int? ShardSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
-
 	[JsonInclude, JsonPropertyName("smoothing")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SmoothingModel? Smoothing { get; set; }
-
 	[JsonInclude, JsonPropertyName("text")]
 	public string? Text { get; set; }
-
 	[JsonInclude, JsonPropertyName("token_limit")]
 	public int? TokenLimit { get; set; }
 
@@ -81,58 +68,35 @@ public sealed partial class PhraseSuggester
 public sealed partial class PhraseSuggesterDescriptor<TDocument> : SerializableDescriptor<PhraseSuggesterDescriptor<TDocument>>
 {
 	internal PhraseSuggesterDescriptor(Action<PhraseSuggesterDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PhraseSuggesterDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Core.Search.DirectGenerator>? DirectGeneratorValue { get; set; }
-
 	private DirectGeneratorDescriptor<TDocument> DirectGeneratorDescriptor { get; set; }
-
 	private Action<DirectGeneratorDescriptor<TDocument>> DirectGeneratorDescriptorAction { get; set; }
-
 	private Action<DirectGeneratorDescriptor<TDocument>>[] DirectGeneratorDescriptorActions { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestCollate? CollateValue { get; set; }
-
 	private PhraseSuggestCollateDescriptor CollateDescriptor { get; set; }
-
 	private Action<PhraseSuggestCollateDescriptor> CollateDescriptorAction { get; set; }
-
 	private double? ConfidenceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private bool? ForceUnigramsValue { get; set; }
-
 	private int? GramSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestHighlight? HighlightValue { get; set; }
-
 	private PhraseSuggestHighlightDescriptor HighlightDescriptor { get; set; }
-
 	private Action<PhraseSuggestHighlightDescriptor> HighlightDescriptorAction { get; set; }
-
 	private double? MaxErrorsValue { get; set; }
-
 	private double? RealWordErrorLikelihoodValue { get; set; }
-
 	private string? SeparatorValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SmoothingModel? SmoothingValue { get; set; }
-
 	private SmoothingModelDescriptor SmoothingDescriptor { get; set; }
-
 	private Action<SmoothingModelDescriptor> SmoothingDescriptorAction { get; set; }
-
 	private string? TextValue { get; set; }
-
 	private int? TokenLimitValue { get; set; }
 
 	public PhraseSuggesterDescriptor<TDocument> DirectGenerator(ICollection<Elastic.Clients.Elasticsearch.Core.Search.DirectGenerator>? directGenerator)
@@ -478,58 +442,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class PhraseSuggesterDescriptor : SerializableDescriptor<PhraseSuggesterDescriptor>
 {
 	internal PhraseSuggesterDescriptor(Action<PhraseSuggesterDescriptor> configure) => configure.Invoke(this);
+
 	public PhraseSuggesterDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Core.Search.DirectGenerator>? DirectGeneratorValue { get; set; }
-
 	private DirectGeneratorDescriptor DirectGeneratorDescriptor { get; set; }
-
 	private Action<DirectGeneratorDescriptor> DirectGeneratorDescriptorAction { get; set; }
-
 	private Action<DirectGeneratorDescriptor>[] DirectGeneratorDescriptorActions { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestCollate? CollateValue { get; set; }
-
 	private PhraseSuggestCollateDescriptor CollateDescriptor { get; set; }
-
 	private Action<PhraseSuggestCollateDescriptor> CollateDescriptorAction { get; set; }
-
 	private double? ConfidenceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private bool? ForceUnigramsValue { get; set; }
-
 	private int? GramSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.PhraseSuggestHighlight? HighlightValue { get; set; }
-
 	private PhraseSuggestHighlightDescriptor HighlightDescriptor { get; set; }
-
 	private Action<PhraseSuggestHighlightDescriptor> HighlightDescriptorAction { get; set; }
-
 	private double? MaxErrorsValue { get; set; }
-
 	private double? RealWordErrorLikelihoodValue { get; set; }
-
 	private string? SeparatorValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SmoothingModel? SmoothingValue { get; set; }
-
 	private SmoothingModelDescriptor SmoothingDescriptor { get; set; }
-
 	private Action<SmoothingModelDescriptor> SmoothingDescriptorAction { get; set; }
-
 	private string? TextValue { get; set; }
-
 	private int? TokenLimitValue { get; set; }
 
 	public PhraseSuggesterDescriptor DirectGenerator(ICollection<Elastic.Clients.Elasticsearch.Core.Search.DirectGenerator>? directGenerator)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PointInTimeReference.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PointInTimeReference.g.cs
index 09e81a57a23..de91ffbe541 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PointInTimeReference.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/PointInTimeReference.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class PointInTimeReference
 {
 	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; set; }
-
 	[JsonInclude, JsonPropertyName("keep_alive")]
 	public Elastic.Clients.Elasticsearch.Duration? KeepAlive { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class PointInTimeReference
 public sealed partial class PointInTimeReferenceDescriptor : SerializableDescriptor<PointInTimeReferenceDescriptor>
 {
 	internal PointInTimeReferenceDescriptor(Action<PointInTimeReferenceDescriptor> configure) => configure.Invoke(this);
+
 	public PointInTimeReferenceDescriptor() : base()
 	{
 	}
 
 	private string IdValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? KeepAliveValue { get; set; }
 
 	public PointInTimeReferenceDescriptor Id(string id)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Profile.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Profile.g.cs
index 73193b4d588..b266403c9e3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Profile.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Profile.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class Profile
 {
 	[JsonInclude, JsonPropertyName("shards")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/QueryBreakdown.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/QueryBreakdown.g.cs
index 19e94bb1fa3..822a7c758e9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/QueryBreakdown.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/QueryBreakdown.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,61 +25,44 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class QueryBreakdown
 {
 	[JsonInclude, JsonPropertyName("advance")]
 	public long Advance { get; init; }
-
 	[JsonInclude, JsonPropertyName("advance_count")]
 	public long AdvanceCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("build_scorer")]
 	public long BuildScorer { get; init; }
-
 	[JsonInclude, JsonPropertyName("build_scorer_count")]
 	public long BuildScorerCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("compute_max_score")]
 	public long ComputeMaxScore { get; init; }
-
 	[JsonInclude, JsonPropertyName("compute_max_score_count")]
 	public long ComputeMaxScoreCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("create_weight")]
 	public long CreateWeight { get; init; }
-
 	[JsonInclude, JsonPropertyName("create_weight_count")]
 	public long CreateWeightCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("match")]
 	public long Match { get; init; }
-
 	[JsonInclude, JsonPropertyName("match_count")]
 	public long MatchCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("next_doc")]
 	public long NextDoc { get; init; }
-
 	[JsonInclude, JsonPropertyName("next_doc_count")]
 	public long NextDocCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("score")]
 	public long Score { get; init; }
-
 	[JsonInclude, JsonPropertyName("score_count")]
 	public long ScoreCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("set_min_competitive_score")]
 	public long SetMinCompetitiveScore { get; init; }
-
 	[JsonInclude, JsonPropertyName("set_min_competitive_score_count")]
 	public long SetMinCompetitiveScoreCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("shallow_advance")]
 	public long ShallowAdvance { get; init; }
-
 	[JsonInclude, JsonPropertyName("shallow_advance_count")]
 	public long ShallowAdvanceCount { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/QueryProfile.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/QueryProfile.g.cs
index 19a9bd68e02..3d3ed012fa2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/QueryProfile.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/QueryProfile.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class QueryProfile
 {
 	[JsonInclude, JsonPropertyName("breakdown")]
 	public Elastic.Clients.Elasticsearch.Core.Search.QueryBreakdown Breakdown { get; init; }
-
 	[JsonInclude, JsonPropertyName("children")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.QueryProfile>? Children { get; init; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-
 	[JsonInclude, JsonPropertyName("time_in_nanos")]
 	public long TimeInNanos { get; init; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Rescore.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Rescore.g.cs
index 7f7dd9f7aaa..96ad9760416 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Rescore.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Rescore.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class Rescore
 {
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.Core.Search.RescoreQuery Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("window_size")]
 	public int? WindowSize { get; set; }
 }
@@ -37,16 +38,14 @@ public sealed partial class Rescore
 public sealed partial class RescoreDescriptor<TDocument> : SerializableDescriptor<RescoreDescriptor<TDocument>>
 {
 	internal RescoreDescriptor(Action<RescoreDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RescoreDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.RescoreQuery QueryValue { get; set; }
-
 	private RescoreQueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<RescoreQueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private int? WindowSizeValue { get; set; }
 
 	public RescoreDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.Core.Search.RescoreQuery query)
@@ -111,16 +110,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RescoreDescriptor : SerializableDescriptor<RescoreDescriptor>
 {
 	internal RescoreDescriptor(Action<RescoreDescriptor> configure) => configure.Invoke(this);
+
 	public RescoreDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.RescoreQuery QueryValue { get; set; }
-
 	private RescoreQueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<RescoreQueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private int? WindowSizeValue { get; set; }
 
 	public RescoreDescriptor Query(Elastic.Clients.Elasticsearch.Core.Search.RescoreQuery query)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/RescoreQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/RescoreQuery.g.cs
index e04695f8c9b..8b0c2d8f221 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/RescoreQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/RescoreQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class RescoreQuery
 {
 	[JsonInclude, JsonPropertyName("query_weight")]
 	public double? QueryWeight { get; set; }
-
 	[JsonInclude, JsonPropertyName("rescore_query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("rescore_query_weight")]
 	public double? RescoreQueryWeight { get; set; }
-
 	[JsonInclude, JsonPropertyName("score_mode")]
 	public Elastic.Clients.Elasticsearch.Core.Search.ScoreMode? ScoreMode { get; set; }
 }
@@ -43,20 +42,16 @@ public sealed partial class RescoreQuery
 public sealed partial class RescoreQueryDescriptor<TDocument> : SerializableDescriptor<RescoreQueryDescriptor<TDocument>>
 {
 	internal RescoreQueryDescriptor(Action<RescoreQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RescoreQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private double? QueryWeightValue { get; set; }
-
 	private double? RescoreQueryWeightValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.ScoreMode? ScoreModeValue { get; set; }
 
 	public RescoreQueryDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query)
@@ -145,20 +140,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RescoreQueryDescriptor : SerializableDescriptor<RescoreQueryDescriptor>
 {
 	internal RescoreQueryDescriptor(Action<RescoreQueryDescriptor> configure) => configure.Invoke(this);
+
 	public RescoreQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDsl.QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private double? QueryWeightValue { get; set; }
-
 	private double? RescoreQueryWeightValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.ScoreMode? ScoreModeValue { get; set; }
 
 	public RescoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SearchProfile.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SearchProfile.g.cs
index d31c2d26b07..f90b2765ee4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SearchProfile.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SearchProfile.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class SearchProfile
 {
 	[JsonInclude, JsonPropertyName("collector")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.Collector> Collector { get; init; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.QueryProfile> Query { get; init; }
-
 	[JsonInclude, JsonPropertyName("rewrite_time")]
 	public long RewriteTime { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/ShardProfile.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/ShardProfile.g.cs
index ba108ba4324..d7f4b76f217 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/ShardProfile.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/ShardProfile.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class ShardProfile
 {
 	[JsonInclude, JsonPropertyName("aggregations")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.AggregationProfile> Aggregations { get; init; }
-
 	[JsonInclude, JsonPropertyName("fetch")]
 	public Elastic.Clients.Elasticsearch.Core.Search.FetchProfile? Fetch { get; init; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("searches")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Core.Search.SearchProfile> Searches { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModel.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModel.g.cs
index 49725467457..614f6fd92ec 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModel.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModel.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 [JsonConverter(typeof(SmoothingModelConverter))]
 public sealed partial class SmoothingModel
 {
@@ -41,7 +43,6 @@ internal SmoothingModel(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static SmoothingModel Laplace(Elastic.Clients.Elasticsearch.Core.Search.LaplaceSmoothingModel laplaceSmoothingModel) => new SmoothingModel("laplace", laplaceSmoothingModel);
@@ -114,20 +115,17 @@ public override void Write(Utf8JsonWriter writer, SmoothingModel value, JsonSeri
 public sealed partial class SmoothingModelDescriptor<TDocument> : SerializableDescriptor<SmoothingModelDescriptor<TDocument>>
 {
 	internal SmoothingModelDescriptor(Action<SmoothingModelDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SmoothingModelDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private SmoothingModelDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private SmoothingModelDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -151,6 +149,7 @@ private SmoothingModelDescriptor<TDocument> Set(object variant, string variantNa
 	public SmoothingModelDescriptor<TDocument> LinearInterpolation(Action<LinearInterpolationSmoothingModelDescriptor> configure) => Set(configure, "linear_interpolation");
 	public SmoothingModelDescriptor<TDocument> StupidBackoff(StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => Set(stupidBackoffSmoothingModel, "stupid_backoff");
 	public SmoothingModelDescriptor<TDocument> StupidBackoff(Action<StupidBackoffSmoothingModelDescriptor> configure) => Set(configure, "stupid_backoff");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -176,20 +175,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SmoothingModelDescriptor : SerializableDescriptor<SmoothingModelDescriptor>
 {
 	internal SmoothingModelDescriptor(Action<SmoothingModelDescriptor> configure) => configure.Invoke(this);
+
 	public SmoothingModelDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private SmoothingModelDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private SmoothingModelDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -213,6 +209,7 @@ private SmoothingModelDescriptor Set(object variant, string variantName)
 	public SmoothingModelDescriptor LinearInterpolation(Action<LinearInterpolationSmoothingModelDescriptor> configure) => Set(configure, "linear_interpolation");
 	public SmoothingModelDescriptor StupidBackoff(StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => Set(stupidBackoffSmoothingModel, "stupid_backoff");
 	public SmoothingModelDescriptor StupidBackoff(Action<StupidBackoffSmoothingModelDescriptor> configure) => Set(configure, "stupid_backoff");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SourceFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SourceFilter.g.cs
index 7962bffdfe8..9954ce3d2d4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SourceFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SourceFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 internal sealed partial class SourceFilterConverter : JsonConverter<SourceFilter>
 {
 	public override SourceFilter Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -77,19 +79,18 @@ public override void Write(Utf8JsonWriter writer, SourceFilter value, JsonSerial
 public sealed partial class SourceFilter
 {
 	public Elastic.Clients.Elasticsearch.Fields? Excludes { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Fields? Includes { get; set; }
 }
 
 public sealed partial class SourceFilterDescriptor : SerializableDescriptor<SourceFilterDescriptor>
 {
 	internal SourceFilterDescriptor(Action<SourceFilterDescriptor> configure) => configure.Invoke(this);
+
 	public SourceFilterDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? ExcludesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? IncludesValue { get; set; }
 
 	public SourceFilterDescriptor Excludes(Elastic.Clients.Elasticsearch.Fields? excludes)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/StupidBackoffSmoothingModel.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/StupidBackoffSmoothingModel.g.cs
index d22bcd72ca2..415cefc4ca1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/StupidBackoffSmoothingModel.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/StupidBackoffSmoothingModel.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class StupidBackoffSmoothingModel
 {
 	[JsonInclude, JsonPropertyName("discount")]
@@ -36,6 +38,7 @@ public sealed partial class StupidBackoffSmoothingModel
 public sealed partial class StupidBackoffSmoothingModelDescriptor : SerializableDescriptor<StupidBackoffSmoothingModelDescriptor>
 {
 	internal StupidBackoffSmoothingModelDescriptor(Action<StupidBackoffSmoothingModelDescriptor> configure) => configure.Invoke(this);
+
 	public StupidBackoffSmoothingModelDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SuggestFuzziness.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SuggestFuzziness.g.cs
index 208d0dea645..166e3a656cd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SuggestFuzziness.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SuggestFuzziness.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class SuggestFuzziness
 {
 	[JsonInclude, JsonPropertyName("fuzziness")]
 	public Elastic.Clients.Elasticsearch.Fuzziness? Fuzziness { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_length")]
 	public int? MinLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("prefix_length")]
 	public int? PrefixLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("transpositions")]
 	public bool? Transpositions { get; set; }
-
 	[JsonInclude, JsonPropertyName("unicode_aware")]
 	public bool? UnicodeAware { get; set; }
 }
@@ -46,18 +44,15 @@ public sealed partial class SuggestFuzziness
 public sealed partial class SuggestFuzzinessDescriptor : SerializableDescriptor<SuggestFuzzinessDescriptor>
 {
 	internal SuggestFuzzinessDescriptor(Action<SuggestFuzzinessDescriptor> configure) => configure.Invoke(this);
+
 	public SuggestFuzzinessDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private int? MinLengthValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private bool? TranspositionsValue { get; set; }
-
 	private bool? UnicodeAwareValue { get; set; }
 
 	public SuggestFuzzinessDescriptor Fuzziness(Elastic.Clients.Elasticsearch.Fuzziness? fuzziness)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Suggester.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Suggester.g.cs
index 8fe6b9a779f..b3b2a8885fd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Suggester.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Suggester.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 internal sealed partial class SuggesterConverter : JsonConverter<Suggester>
 {
 	public override Suggester Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -81,18 +83,21 @@ public sealed partial class Suggester
 {
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Core.Search.FieldSuggester> Suggesters { get; set; }
 
+	/// <summary>
+	/// <para>Global suggest text, to avoid repetition when the same text is used in several suggesters</para>
+	/// </summary>
 	public string? Text { get; set; }
 }
 
 public sealed partial class SuggesterDescriptor : SerializableDescriptor<SuggesterDescriptor>
 {
 	internal SuggesterDescriptor(Action<SuggesterDescriptor> configure) => configure.Invoke(this);
+
 	public SuggesterDescriptor() : base()
 	{
 	}
 
 	private IDictionary<string, Elastic.Clients.Elasticsearch.Core.Search.FieldSuggester> SuggestersValue { get; set; }
-
 	private string? TextValue { get; set; }
 
 	public SuggesterDescriptor Suggesters(Func<FluentDictionary<string, Elastic.Clients.Elasticsearch.Core.Search.FieldSuggester>, FluentDictionary<string, Elastic.Clients.Elasticsearch.Core.Search.FieldSuggester>> selector)
@@ -101,6 +106,9 @@ public SuggesterDescriptor Suggesters(Func<FluentDictionary<string, Elastic.Clie
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Global suggest text, to avoid repetition when the same text is used in several suggesters</para>
+	/// </summary>
 	public SuggesterDescriptor Text(string? text)
 	{
 		TextValue = text;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggester.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggester.g.cs
index 9da476ba7e9..fb686deaea9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggester.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TermSuggester.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,52 +25,38 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class TermSuggester
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("lowercase_terms")]
 	public bool? LowercaseTerms { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_edits")]
 	public int? MaxEdits { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_inspections")]
 	public int? MaxInspections { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_term_freq")]
 	public float? MaxTermFreq { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_doc_freq")]
 	public float? MinDocFreq { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_word_length")]
 	public int? MinWordLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("prefix_length")]
 	public int? PrefixLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("shard_size")]
 	public int? ShardSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("size")]
 	public int? Size { get; set; }
-
 	[JsonInclude, JsonPropertyName("sort")]
 	public Elastic.Clients.Elasticsearch.Core.Search.SuggestSort? Sort { get; set; }
-
 	[JsonInclude, JsonPropertyName("string_distance")]
 	public Elastic.Clients.Elasticsearch.Core.Search.StringDistance? StringDistance { get; set; }
-
 	[JsonInclude, JsonPropertyName("suggest_mode")]
 	public Elastic.Clients.Elasticsearch.SuggestMode? SuggestMode { get; set; }
-
 	[JsonInclude, JsonPropertyName("text")]
 	public string? Text { get; set; }
 
@@ -78,38 +66,25 @@ public sealed partial class TermSuggester
 public sealed partial class TermSuggesterDescriptor<TDocument> : SerializableDescriptor<TermSuggesterDescriptor<TDocument>>
 {
 	internal TermSuggesterDescriptor(Action<TermSuggesterDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TermSuggesterDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private bool? LowercaseTermsValue { get; set; }
-
 	private int? MaxEditsValue { get; set; }
-
 	private int? MaxInspectionsValue { get; set; }
-
 	private float? MaxTermFreqValue { get; set; }
-
 	private float? MinDocFreqValue { get; set; }
-
 	private int? MinWordLengthValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SuggestSort? SortValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.StringDistance? StringDistanceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SuggestMode? SuggestModeValue { get; set; }
-
 	private string? TextValue { get; set; }
 
 	public TermSuggesterDescriptor<TDocument> Analyzer(string? analyzer)
@@ -304,38 +279,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TermSuggesterDescriptor : SerializableDescriptor<TermSuggesterDescriptor>
 {
 	internal TermSuggesterDescriptor(Action<TermSuggesterDescriptor> configure) => configure.Invoke(this);
+
 	public TermSuggesterDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private bool? LowercaseTermsValue { get; set; }
-
 	private int? MaxEditsValue { get; set; }
-
 	private int? MaxInspectionsValue { get; set; }
-
 	private float? MaxTermFreqValue { get; set; }
-
 	private float? MinDocFreqValue { get; set; }
-
 	private int? MinWordLengthValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private int? ShardSizeValue { get; set; }
-
 	private int? SizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.SuggestSort? SortValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Core.Search.StringDistance? StringDistanceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SuggestMode? SuggestModeValue { get; set; }
-
 	private string? TextValue { get; set; }
 
 	public TermSuggesterDescriptor Analyzer(string? analyzer)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TotalHits.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TotalHits.g.cs
index 6c39a8ee113..6df716adf34 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TotalHits.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/TotalHits.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class TotalHits
 {
 	[JsonInclude, JsonPropertyName("relation")]
 	public Elastic.Clients.Elasticsearch.Core.Search.TotalHitsRelation Relation { get; init; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public long Value { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SearchShards/ShardStoreIndex.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SearchShards/ShardStoreIndex.g.cs
index 5e39ef36639..68a030fd325 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SearchShards/ShardStoreIndex.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SearchShards/ShardStoreIndex.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.SearchShards;
+
 public sealed partial class ShardStoreIndex
 {
 	[JsonInclude, JsonPropertyName("aliases")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Name>? Aliases { get; init; }
-
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SourceConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SourceConfig.g.cs
index 5083b94adfa..c4ea0fe9d1c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SourceConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SourceConfig.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class SourceConfig : Union<bool, Elastic.Clients.Elasticsearch.Core.Search.SourceFilter>
 {
 	public SourceConfig(bool fetch) : base(fetch)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SourceConfigParam.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SourceConfigParam.g.cs
index cb62ac8d9f2..4048a18def2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SourceConfigParam.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/SourceConfigParam.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class SourceConfigParam : Union<bool, Elastic.Clients.Elasticsearch.Fields>
 {
 	public SourceConfigParam(bool fetch) : base(fetch)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/TrackHits.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/TrackHits.g.cs
index 2ed6c1c02b4..a55d100efed 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/TrackHits.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/TrackHits.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 public sealed partial class TrackHits : Union<bool, int>
 {
 	public TrackHits(bool enabled) : base(enabled)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/UpdateByQueryRethrottle/UpdateByQueryRethrottleNode.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/UpdateByQueryRethrottle/UpdateByQueryRethrottleNode.g.cs
index e571d268f54..6589bc7a9b4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/UpdateByQueryRethrottle/UpdateByQueryRethrottleNode.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/UpdateByQueryRethrottle/UpdateByQueryRethrottleNode.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.UpdateByQueryRethrottle;
+
 public sealed partial class UpdateByQueryRethrottleNode
 {
 	[JsonInclude, JsonPropertyName("attributes")]
 	public IReadOnlyDictionary<string, string> Attributes { get; init; }
-
 	[JsonInclude, JsonPropertyName("host")]
 	public string Host { get; init; }
-
 	[JsonInclude, JsonPropertyName("ip")]
 	public string Ip { get; init; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-
 	[JsonInclude, JsonPropertyName("roles")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.NodeRole>? Roles { get; init; }
-
 	[JsonInclude, JsonPropertyName("tasks")]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.TaskId, Elastic.Clients.Elasticsearch.Tasks.TaskInfo> Tasks { get; init; }
-
 	[JsonInclude, JsonPropertyName("transport_address")]
 	public string TransportAddress { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/DocStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/DocStats.g.cs
index b722d4c1e09..9173402743e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/DocStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/DocStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class DocStats
 {
 	[JsonInclude, JsonPropertyName("count")]
 	public long Count { get; init; }
-
 	[JsonInclude, JsonPropertyName("deleted")]
 	public long? Deleted { get; init; }
 }
\ 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 6eabb0f9bef..96417d2236e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ElasticsearchVersionInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ElasticsearchVersionInfo.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ElasticsearchVersionInfo
 {
 	[JsonInclude, JsonPropertyName("build_date")]
 	public DateTimeOffset BuildDate { get; init; }
-
 	[JsonInclude, JsonPropertyName("build_flavor")]
 	public string BuildFlavor { get; init; }
-
 	[JsonInclude, JsonPropertyName("build_hash")]
 	public string BuildHash { get; init; }
-
 	[JsonInclude, JsonPropertyName("build_snapshot")]
 	public bool BuildSnapshot { get; init; }
-
 	[JsonInclude, JsonPropertyName("build_type")]
 	public string BuildType { get; init; }
-
 	[JsonInclude, JsonPropertyName("lucene_version")]
 	public string LuceneVersion { get; init; }
-
 	[JsonInclude, JsonPropertyName("minimum_index_compatibility_version")]
 	public string MinimumIndexCompatibilityVersion { get; init; }
-
 	[JsonInclude, JsonPropertyName("minimum_wire_compatibility_version")]
 	public string MinimumWireCompatibilityVersion { get; init; }
-
 	[JsonInclude, JsonPropertyName("number")]
 	public string Number { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Aggregations.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Aggregations.g.cs
index 75f01f60aa0..dd53afc0dfa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Aggregations.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Aggregations.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,8 +24,8 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Aggregations;
+
 [JsonConverter(typeof(CalendarIntervalConverter))]
 public enum CalendarInterval
 {
@@ -78,8 +80,7 @@ public override CalendarInterval Read(ref Utf8JsonReader reader, Type typeToConv
 				return CalendarInterval.Day;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, CalendarInterval value, JsonSerializerOptions options)
@@ -150,8 +151,7 @@ public override CardinalityExecutionMode Read(ref Utf8JsonReader reader, Type ty
 				return CardinalityExecutionMode.Direct;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, CardinalityExecutionMode value, JsonSerializerOptions options)
@@ -182,10 +182,19 @@ public override void Write(Utf8JsonWriter writer, CardinalityExecutionMode value
 [JsonConverter(typeof(GapPolicyConverter))]
 public enum GapPolicy
 {
+	/// <summary>
+	/// <para>Treats missing data as if the bucket does not exist. It will skip the bucket and<br/>continue calculating using the next available value.</para>
+	/// </summary>
 	[EnumMember(Value = "skip")]
 	Skip,
+	/// <summary>
+	/// <para>Similar to skip, except if the metric provides a non-null, non-NaN value this value is used,<br/>otherwise the empty bucket is skipped.</para>
+	/// </summary>
 	[EnumMember(Value = "keep_values")]
 	KeepValues,
+	/// <summary>
+	/// <para>Replace missing values with a zero (0) and pipeline aggregation computation will proceed as normal.</para>
+	/// </summary>
 	[EnumMember(Value = "insert_zeros")]
 	InsertZeros
 }
@@ -205,8 +214,7 @@ public override GapPolicy Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 				return GapPolicy.InsertZeros;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, GapPolicy value, JsonSerializerOptions options)
@@ -266,8 +274,7 @@ public override MinimumInterval Read(ref Utf8JsonReader reader, Type typeToConve
 				return MinimumInterval.Day;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, MinimumInterval value, JsonSerializerOptions options)
@@ -324,8 +331,7 @@ public override MissingOrder Read(ref Utf8JsonReader reader, Type typeToConvert,
 				return MissingOrder.Default;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, MissingOrder value, JsonSerializerOptions options)
@@ -369,8 +375,7 @@ public override RateMode Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
 				return RateMode.Sum;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, RateMode value, JsonSerializerOptions options)
@@ -411,8 +416,7 @@ public override TermsAggregationCollectMode Read(ref Utf8JsonReader reader, Type
 				return TermsAggregationCollectMode.BreadthFirst;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, TermsAggregationCollectMode value, JsonSerializerOptions options)
@@ -461,8 +465,7 @@ public override TermsAggregationExecutionHint Read(ref Utf8JsonReader reader, Ty
 				return TermsAggregationExecutionHint.GlobalOrdinals;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, TermsAggregationExecutionHint value, JsonSerializerOptions options)
@@ -513,8 +516,7 @@ public override TTestType Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 				return TTestType.Heteroscedastic;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, TTestType value, JsonSerializerOptions options)
@@ -590,8 +592,7 @@ public override ValueType Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 				return ValueType.Boolean;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, ValueType value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Analysis.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Analysis.g.cs
index 65ba83d4f8f..72dc4d36027 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Analysis.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Analysis.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,8 +24,8 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Analysis;
+
 [JsonConverter(typeof(DelimitedPayloadEncodingConverter))]
 public enum DelimitedPayloadEncoding
 {
@@ -50,8 +52,7 @@ public override DelimitedPayloadEncoding Read(ref Utf8JsonReader reader, Type ty
 				return DelimitedPayloadEncoding.Float;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, DelimitedPayloadEncoding value, JsonSerializerOptions options)
@@ -95,8 +96,7 @@ public override EdgeNGramSide Read(ref Utf8JsonReader reader, Type typeToConvert
 				return EdgeNGramSide.Back;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, EdgeNGramSide value, JsonSerializerOptions options)
@@ -137,8 +137,7 @@ public override IcuCollationAlternate Read(ref Utf8JsonReader reader, Type typeT
 				return IcuCollationAlternate.NonIgnorable;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IcuCollationAlternate value, JsonSerializerOptions options)
@@ -179,8 +178,7 @@ public override IcuCollationCaseFirst Read(ref Utf8JsonReader reader, Type typeT
 				return IcuCollationCaseFirst.Lower;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IcuCollationCaseFirst value, JsonSerializerOptions options)
@@ -221,8 +219,7 @@ public override IcuCollationDecomposition Read(ref Utf8JsonReader reader, Type t
 				return IcuCollationDecomposition.Identical;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IcuCollationDecomposition value, JsonSerializerOptions options)
@@ -275,8 +272,7 @@ public override IcuCollationStrength Read(ref Utf8JsonReader reader, Type typeTo
 				return IcuCollationStrength.Identical;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IcuCollationStrength value, JsonSerializerOptions options)
@@ -326,8 +322,7 @@ public override IcuNormalizationMode Read(ref Utf8JsonReader reader, Type typeTo
 				return IcuNormalizationMode.Compose;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IcuNormalizationMode value, JsonSerializerOptions options)
@@ -372,8 +367,7 @@ public override IcuNormalizationType Read(ref Utf8JsonReader reader, Type typeTo
 				return IcuNormalizationType.Nfc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IcuNormalizationType value, JsonSerializerOptions options)
@@ -417,8 +411,7 @@ public override IcuTransformDirection Read(ref Utf8JsonReader reader, Type typeT
 				return IcuTransformDirection.Forward;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IcuTransformDirection value, JsonSerializerOptions options)
@@ -459,8 +452,7 @@ public override KeepTypesMode Read(ref Utf8JsonReader reader, Type typeToConvert
 				return KeepTypesMode.Exclude;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, KeepTypesMode value, JsonSerializerOptions options)
@@ -505,8 +497,7 @@ public override KuromojiTokenizationMode Read(ref Utf8JsonReader reader, Type ty
 				return KuromojiTokenizationMode.Extended;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, KuromojiTokenizationMode value, JsonSerializerOptions options)
@@ -678,8 +669,7 @@ public override Language Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
 				return Language.Arabic;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, Language value, JsonSerializerOptions options)
@@ -820,8 +810,7 @@ public override NoriDecompoundMode Read(ref Utf8JsonReader reader, Type typeToCo
 				return NoriDecompoundMode.Discard;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, NoriDecompoundMode value, JsonSerializerOptions options)
@@ -905,8 +894,7 @@ public override PhoneticEncoder Read(ref Utf8JsonReader reader, Type typeToConve
 				return PhoneticEncoder.BeiderMorse;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, PhoneticEncoder value, JsonSerializerOptions options)
@@ -1017,8 +1005,7 @@ public override PhoneticLanguage Read(ref Utf8JsonReader reader, Type typeToConv
 				return PhoneticLanguage.Any;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, PhoneticLanguage value, JsonSerializerOptions options)
@@ -1093,8 +1080,7 @@ public override PhoneticNameType Read(ref Utf8JsonReader reader, Type typeToConv
 				return PhoneticNameType.Ashkenazi;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, PhoneticNameType value, JsonSerializerOptions options)
@@ -1138,8 +1124,7 @@ public override PhoneticRuleType Read(ref Utf8JsonReader reader, Type typeToConv
 				return PhoneticRuleType.Approx;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, PhoneticRuleType value, JsonSerializerOptions options)
@@ -1260,8 +1245,7 @@ public override SnowballLanguage Read(ref Utf8JsonReader reader, Type typeToConv
 				return SnowballLanguage.Armenian;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SnowballLanguage value, JsonSerializerOptions options)
@@ -1362,8 +1346,7 @@ public override SynonymFormat Read(ref Utf8JsonReader reader, Type typeToConvert
 				return SynonymFormat.Solr;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SynonymFormat value, JsonSerializerOptions options)
@@ -1420,8 +1403,7 @@ public override TokenChar Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 				return TokenChar.Custom;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, TokenChar value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Cluster.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Cluster.g.cs
index 4e7ce1b9343..25c17beaddb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Cluster.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Cluster.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,8 +24,8 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Cluster;
+
 [JsonConverter(typeof(UnassignedInformationReasonConverter))]
 public enum UnassignedInformationReason
 {
@@ -98,8 +100,7 @@ public override UnassignedInformationReason Read(ref Utf8JsonReader reader, Type
 				return UnassignedInformationReason.AllocationFailed;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, UnassignedInformationReason value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.Search.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.Search.g.cs
index 52f348bdce7..2a38d6aa359 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.Search.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Core.Search.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,8 +24,8 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Core.Search;
+
 [JsonConverter(typeof(BoundaryScannerConverter))]
 public enum BoundaryScanner
 {
@@ -50,8 +52,7 @@ public override BoundaryScanner Read(ref Utf8JsonReader reader, Type typeToConve
 				return BoundaryScanner.Chars;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, BoundaryScanner value, JsonSerializerOptions options)
@@ -95,8 +96,7 @@ public override HighlighterEncoder Read(ref Utf8JsonReader reader, Type typeToCo
 				return HighlighterEncoder.Default;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, HighlighterEncoder value, JsonSerializerOptions options)
@@ -137,8 +137,7 @@ public override HighlighterFragmenter Read(ref Utf8JsonReader reader, Type typeT
 				return HighlighterFragmenter.Simple;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, HighlighterFragmenter value, JsonSerializerOptions options)
@@ -175,8 +174,7 @@ public override HighlighterOrder Read(ref Utf8JsonReader reader, Type typeToConv
 				return HighlighterOrder.Score;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, HighlighterOrder value, JsonSerializerOptions options)
@@ -210,8 +208,7 @@ public override HighlighterTagsSchema Read(ref Utf8JsonReader reader, Type typeT
 				return HighlighterTagsSchema.Styled;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, HighlighterTagsSchema value, JsonSerializerOptions options)
@@ -231,17 +228,21 @@ public override void Write(Utf8JsonWriter writer, HighlighterTagsSchema value, J
 public readonly partial struct HighlighterType
 {
 	public HighlighterType(string value) => Value = value;
-	public readonly string Value { get; }
 
+	public readonly string Value { get; }
 	public static HighlighterType Unified { get; } = new HighlighterType("unified");
 	public static HighlighterType Plain { get; } = new HighlighterType("plain");
 	public static HighlighterType FastVector { get; } = new HighlighterType("fvh");
+
 	public override string ToString() => Value ?? string.Empty;
+
 	public static implicit operator string(HighlighterType highlighterType) => highlighterType.Value;
 	public static implicit operator HighlighterType(string value) => new(value);
+
 	public override int GetHashCode() => Value.GetHashCode();
 	public override bool Equals(object obj) => obj is HighlighterType other && this.Equals(other);
 	public bool Equals(HighlighterType other) => Value == other.Value;
+
 	public static bool operator ==(HighlighterType a, HighlighterType b) => a.Equals(b);
 	public static bool operator !=(HighlighterType a, HighlighterType b) => !(a == b);
 }
@@ -280,8 +281,7 @@ public override ScoreMode Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 				return ScoreMode.Avg;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, ScoreMode value, JsonSerializerOptions options)
@@ -343,8 +343,7 @@ public override StringDistance Read(ref Utf8JsonReader reader, Type typeToConver
 				return StringDistance.DamerauLevenshtein;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, StringDistance value, JsonSerializerOptions options)
@@ -394,8 +393,7 @@ public override SuggestSort Read(ref Utf8JsonReader reader, Type typeToConvert,
 				return SuggestSort.Frequency;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SuggestSort value, JsonSerializerOptions options)
@@ -417,8 +415,14 @@ public override void Write(Utf8JsonWriter writer, SuggestSort value, JsonSeriali
 [JsonConverter(typeof(TotalHitsRelationConverter))]
 public enum TotalHitsRelation
 {
+	/// <summary>
+	/// <para>Lower bound, including returned events or sequences</para>
+	/// </summary>
 	[EnumMember(Value = "gte")]
 	Gte,
+	/// <summary>
+	/// <para>Accurate</para>
+	/// </summary>
 	[EnumMember(Value = "eq")]
 	Eq
 }
@@ -436,8 +440,7 @@ public override TotalHitsRelation Read(ref Utf8JsonReader reader, Type typeToCon
 				return TotalHitsRelation.Eq;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, TotalHitsRelation value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Eql.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Eql.g.cs
index 9f7c931f2fb..e6bbab0cf1b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Eql.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Eql.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,13 +24,19 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 [JsonConverter(typeof(ResultPositionConverter))]
 public enum ResultPosition
 {
+	/// <summary>
+	/// <para>Return the most recent matches, similar to the Unix tail command.</para>
+	/// </summary>
 	[EnumMember(Value = "tail")]
 	Tail,
+	/// <summary>
+	/// <para>Return the earliest matches, similar to the Unix head command.</para>
+	/// </summary>
 	[EnumMember(Value = "head")]
 	Head
 }
@@ -46,8 +54,7 @@ public override ResultPosition Read(ref Utf8JsonReader reader, Type typeToConver
 				return ResultPosition.Head;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, ResultPosition value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.IndexManagement.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.IndexManagement.g.cs
index cd31675ba6d..2cc9f975547 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.IndexManagement.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.IndexManagement.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,8 +24,8 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 [JsonConverter(typeof(FeatureConverter))]
 public enum Feature
 {
@@ -50,8 +52,7 @@ public override Feature Read(ref Utf8JsonReader reader, Type typeToConvert, Json
 				return Feature.Aliases;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, Feature value, JsonSerializerOptions options)
@@ -99,8 +100,7 @@ public override IndexCheckOnStartup Read(ref Utf8JsonReader reader, Type typeToC
 				return IndexCheckOnStartup.Checksum;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IndexCheckOnStartup value, JsonSerializerOptions options)
@@ -144,8 +144,7 @@ public override IndexMetadataState Read(ref Utf8JsonReader reader, Type typeToCo
 				return IndexMetadataState.Close;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IndexMetadataState value, JsonSerializerOptions options)
@@ -194,8 +193,7 @@ public override IndexRoutingAllocationOptions Read(ref Utf8JsonReader reader, Ty
 				return IndexRoutingAllocationOptions.All;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IndexRoutingAllocationOptions value, JsonSerializerOptions options)
@@ -250,8 +248,7 @@ public override IndexRoutingRebalanceOptions Read(ref Utf8JsonReader reader, Typ
 				return IndexRoutingRebalanceOptions.All;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IndexRoutingRebalanceOptions value, JsonSerializerOptions options)
@@ -298,8 +295,7 @@ public override NumericFielddataFormat Read(ref Utf8JsonReader reader, Type type
 				return NumericFielddataFormat.Array;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, NumericFielddataFormat value, JsonSerializerOptions options)
@@ -340,8 +336,7 @@ public override SegmentSortMissing Read(ref Utf8JsonReader reader, Type typeToCo
 				return SegmentSortMissing.First;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SegmentSortMissing value, JsonSerializerOptions options)
@@ -384,8 +379,7 @@ public override SegmentSortMode Read(ref Utf8JsonReader reader, Type typeToConve
 				return SegmentSortMode.Max;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SegmentSortMode value, JsonSerializerOptions options)
@@ -428,8 +422,7 @@ public override SegmentSortOrder Read(ref Utf8JsonReader reader, Type typeToConv
 				return SegmentSortOrder.Asc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SegmentSortOrder value, JsonSerializerOptions options)
@@ -478,8 +471,7 @@ public override ShardRoutingState Read(ref Utf8JsonReader reader, Type typeToCon
 				return ShardRoutingState.Initializing;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, ShardRoutingState value, JsonSerializerOptions options)
@@ -508,18 +500,38 @@ public override void Write(Utf8JsonWriter writer, ShardRoutingState value, JsonS
 public readonly partial struct StorageType
 {
 	public StorageType(string value) => Value = value;
+
 	public readonly string Value { get; }
 
+	/// <summary>
+	/// <para>The NIO FS type stores the shard index on the file system (maps to Lucene NIOFSDirectory) using NIO. It allows multiple<br/>threads to read from the same file concurrently. It is not recommended on Windows because of a bug in the SUN Java<br/>implementation and disables some optimizations for heap memory usage.</para>
+	/// </summary>
 	public static StorageType Niofs { get; } = new StorageType("niofs");
+
+	/// <summary>
+	/// <para>The MMap FS type stores the shard index on the file system (maps to Lucene MMapDirectory) by mapping a file into<br/>memory (mmap). Memory mapping uses up a portion of the virtual memory address space in your process equal to the size<br/>of the file being mapped. Before using this class, be sure you have allowed plenty of virtual address space.</para>
+	/// </summary>
 	public static StorageType Mmapfs { get; } = new StorageType("mmapfs");
+
+	/// <summary>
+	/// <para>The hybridfs type is a hybrid of niofs and mmapfs, which chooses the best file system type for each type of file<br/>based on the read access pattern. Currently only the Lucene term dictionary, norms and doc values files are memory<br/>mapped. All other files are opened using Lucene NIOFSDirectory. Similarly to mmapfs be sure you have allowed<br/>plenty of virtual address space.</para>
+	/// </summary>
 	public static StorageType Hybridfs { get; } = new StorageType("hybridfs");
+
+	/// <summary>
+	/// <para>Default file system implementation. This will pick the best implementation depending on the operating environment, which<br/>is currently hybridfs on all supported systems but is subject to change.</para>
+	/// </summary>
 	public static StorageType Fs { get; } = new StorageType("fs");
+
 	public override string ToString() => Value ?? string.Empty;
+
 	public static implicit operator string(StorageType storageType) => storageType.Value;
 	public static implicit operator StorageType(string value) => new(value);
+
 	public override int GetHashCode() => Value.GetHashCode();
 	public override bool Equals(object obj) => obj is StorageType other && this.Equals(other);
 	public bool Equals(StorageType other) => Value == other.Value;
+
 	public static bool operator ==(StorageType a, StorageType b) => a.Equals(b);
 	public static bool operator !=(StorageType a, StorageType b) => !(a == b);
 }
@@ -527,8 +539,14 @@ public readonly partial struct StorageType
 [JsonConverter(typeof(TranslogDurabilityConverter))]
 public enum TranslogDurability
 {
+	/// <summary>
+	/// <para>(default) fsync and commit after every request. In the event of hardware failure, all acknowledged writes<br/>will already have been committed to disk.</para>
+	/// </summary>
 	[EnumMember(Value = "request")]
 	Request,
+	/// <summary>
+	/// <para>fsync and commit in the background every sync_interval. In the event of a failure, all acknowledged writes<br/>since the last automatic commit will be discarded.</para>
+	/// </summary>
 	[EnumMember(Value = "async")]
 	Async
 }
@@ -548,8 +566,7 @@ public override TranslogDurability Read(ref Utf8JsonReader reader, Type typeToCo
 				return TranslogDurability.Async;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, TranslogDurability value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Ingest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Ingest.g.cs
index 0dc7b4eb930..a0868fe9cbf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Ingest.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Ingest.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,8 +24,8 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 [JsonConverter(typeof(ConvertTypeConverter))]
 public enum ConvertType
 {
@@ -66,8 +68,7 @@ public override ConvertType Read(ref Utf8JsonReader reader, Type typeToConvert,
 				return ConvertType.Auto;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, ConvertType value, JsonSerializerOptions options)
@@ -104,8 +105,14 @@ public override void Write(Utf8JsonWriter writer, ConvertType value, JsonSeriali
 [JsonConverter(typeof(JsonProcessorConflictStrategyConverter))]
 public enum JsonProcessorConflictStrategy
 {
+	/// <summary>
+	/// <para>Root fields that conflict with fields from the parsed JSON will be overridden.</para>
+	/// </summary>
 	[EnumMember(Value = "replace")]
 	Replace,
+	/// <summary>
+	/// <para>Conflicting fields will be merged.</para>
+	/// </summary>
 	[EnumMember(Value = "merge")]
 	Merge
 }
@@ -123,8 +130,7 @@ public override JsonProcessorConflictStrategy Read(ref Utf8JsonReader reader, Ty
 				return JsonProcessorConflictStrategy.Merge;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, JsonProcessorConflictStrategy value, JsonSerializerOptions options)
@@ -165,8 +171,7 @@ public override ShapeType Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 				return ShapeType.GeoShape;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, ShapeType value, JsonSerializerOptions options)
@@ -239,8 +244,7 @@ public override UserAgentProperty Read(ref Utf8JsonReader reader, Type typeToCon
 				return UserAgentProperty.Build;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, UserAgentProperty value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Mapping.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Mapping.g.cs
index 095ff13114b..72b41a7c36d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Mapping.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Mapping.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,8 +24,8 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 [JsonConverter(typeof(DynamicMappingConverter))]
 public enum DynamicMapping
 {
@@ -54,8 +56,7 @@ public override DynamicMapping Read(ref Utf8JsonReader reader, Type typeToConver
 				return DynamicMapping.False;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, DynamicMapping value, JsonSerializerOptions options)
@@ -262,8 +263,7 @@ public override FieldType Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 				return FieldType.AggregateMetricDouble;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, FieldType value, JsonSerializerOptions options)
@@ -430,8 +430,7 @@ public override GeoOrientation Read(ref Utf8JsonReader reader, Type typeToConver
 				return GeoOrientation.Left;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, GeoOrientation value, JsonSerializerOptions options)
@@ -472,8 +471,7 @@ public override GeoStrategy Read(ref Utf8JsonReader reader, Type typeToConvert,
 				return GeoStrategy.Recursive;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, GeoStrategy value, JsonSerializerOptions options)
@@ -522,8 +520,7 @@ public override IndexOptions Read(ref Utf8JsonReader reader, Type typeToConvert,
 				return IndexOptions.Docs;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IndexOptions value, JsonSerializerOptions options)
@@ -570,8 +567,7 @@ public override MatchType Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 				return MatchType.Regex;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, MatchType value, JsonSerializerOptions options)
@@ -612,8 +608,7 @@ public override OnScriptError Read(ref Utf8JsonReader reader, Type typeToConvert
 				return OnScriptError.Continue;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, OnScriptError value, JsonSerializerOptions options)
@@ -674,8 +669,7 @@ public override RuntimeFieldType Read(ref Utf8JsonReader reader, Type typeToConv
 				return RuntimeFieldType.Boolean;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, RuntimeFieldType value, JsonSerializerOptions options)
@@ -712,6 +706,9 @@ public override void Write(Utf8JsonWriter writer, RuntimeFieldType value, JsonSe
 [JsonConverter(typeof(SourceFieldModeConverter))]
 public enum SourceFieldMode
 {
+	/// <summary>
+	/// <para>Instead of storing source documents on disk exactly as you send them,<br/> Elasticsearch can reconstruct source content on the fly upon retrieval.</para>
+	/// </summary>
 	[EnumMember(Value = "synthetic")]
 	Synthetic,
 	[EnumMember(Value = "stored")]
@@ -735,8 +732,7 @@ public override SourceFieldMode Read(ref Utf8JsonReader reader, Type typeToConve
 				return SourceFieldMode.Disabled;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SourceFieldMode value, JsonSerializerOptions options)
@@ -800,8 +796,7 @@ public override TermVectorOption Read(ref Utf8JsonReader reader, Type typeToConv
 				return TermVectorOption.No;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, TermVectorOption value, JsonSerializerOptions options)
@@ -865,8 +860,7 @@ public override TimeSeriesMetricType Read(ref Utf8JsonReader reader, Type typeTo
 				return TimeSeriesMetricType.Counter;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, TimeSeriesMetricType value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Ml.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Ml.g.cs
index 3e93e06ad11..6c6ec49b1ad 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Ml.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Ml.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,8 +24,8 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 [JsonConverter(typeof(TokenizationTruncateConverter))]
 public enum TokenizationTruncate
 {
@@ -50,8 +52,7 @@ public override TokenizationTruncate Read(ref Utf8JsonReader reader, Type typeTo
 				return TokenizationTruncate.First;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, TokenizationTruncate value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.NoNamespace.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.NoNamespace.g.cs
index a09687f9f7a..73b5673c910 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.NoNamespace.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.NoNamespace.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,8 +24,8 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 [JsonConverter(typeof(ConflictsConverter))]
 public enum Conflicts
 {
@@ -46,8 +48,7 @@ public override Conflicts Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 				return Conflicts.Abort;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, Conflicts value, JsonSerializerOptions options)
@@ -92,8 +93,7 @@ public override DFIIndependenceMeasure Read(ref Utf8JsonReader reader, Type type
 				return DFIIndependenceMeasure.Chisquared;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, DFIIndependenceMeasure value, JsonSerializerOptions options)
@@ -141,8 +141,7 @@ public override DFRAfterEffect Read(ref Utf8JsonReader reader, Type typeToConver
 				return DFRAfterEffect.b;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, DFRAfterEffect value, JsonSerializerOptions options)
@@ -206,8 +205,7 @@ public override DFRBasicModel Read(ref Utf8JsonReader reader, Type typeToConvert
 				return DFRBasicModel.Be;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, DFRBasicModel value, JsonSerializerOptions options)
@@ -291,8 +289,7 @@ public override DistanceUnit Read(ref Utf8JsonReader reader, Type typeToConvert,
 				return DistanceUnit.Centimeters;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, DistanceUnit value, JsonSerializerOptions options)
@@ -335,14 +332,29 @@ public override void Write(Utf8JsonWriter writer, DistanceUnit value, JsonSerial
 [JsonConverter(typeof(ExpandWildcardConverter))]
 public enum ExpandWildcard
 {
+	/// <summary>
+	/// <para>Match open, non-hidden indices. Also matches any non-hidden data stream.</para>
+	/// </summary>
 	[EnumMember(Value = "open")]
 	Open,
+	/// <summary>
+	/// <para>Wildcard expressions are not accepted.</para>
+	/// </summary>
 	[EnumMember(Value = "none")]
 	None,
+	/// <summary>
+	/// <para>Match hidden data streams and hidden indices. Must be combined with open, closed, or both.</para>
+	/// </summary>
 	[EnumMember(Value = "hidden")]
 	Hidden,
+	/// <summary>
+	/// <para>Match closed, non-hidden indices. Also matches any non-hidden data stream. Data streams cannot be closed.</para>
+	/// </summary>
 	[EnumMember(Value = "closed")]
 	Closed,
+	/// <summary>
+	/// <para>Match any data stream or index, including hidden ones.</para>
+	/// </summary>
 	[EnumMember(Value = "all")]
 	All
 }
@@ -366,8 +378,7 @@ public override ExpandWildcard Read(ref Utf8JsonReader reader, Type typeToConver
 				return ExpandWildcard.All;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, ExpandWildcard value, JsonSerializerOptions options)
@@ -425,8 +436,7 @@ public override FieldSortNumericType Read(ref Utf8JsonReader reader, Type typeTo
 				return FieldSortNumericType.Date;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, FieldSortNumericType value, JsonSerializerOptions options)
@@ -473,8 +483,7 @@ public override GeoDistanceType Read(ref Utf8JsonReader reader, Type typeToConve
 				return GeoDistanceType.Arc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, GeoDistanceType value, JsonSerializerOptions options)
@@ -523,8 +532,7 @@ public override GeoShapeRelation Read(ref Utf8JsonReader reader, Type typeToConv
 				return GeoShapeRelation.Contains;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, GeoShapeRelation value, JsonSerializerOptions options)
@@ -552,10 +560,19 @@ public override void Write(Utf8JsonWriter writer, GeoShapeRelation value, JsonSe
 [JsonConverter(typeof(HealthStatusConverter))]
 public enum HealthStatus
 {
+	/// <summary>
+	/// <para>All primary shards are assigned, but one or more replica shards are unassigned. If a node in the cluster fails, some data could be unavailable until that node is repaired.</para>
+	/// </summary>
 	[EnumMember(Value = "yellow")]
 	Yellow,
+	/// <summary>
+	/// <para>One or more primary shards are unassigned, so some data is unavailable. This can occur briefly during cluster startup as primary shards are assigned.</para>
+	/// </summary>
 	[EnumMember(Value = "red")]
 	Red,
+	/// <summary>
+	/// <para>All shards are assigned.</para>
+	/// </summary>
 	[EnumMember(Value = "green")]
 	Green
 }
@@ -578,8 +595,7 @@ public override HealthStatus Read(ref Utf8JsonReader reader, Type typeToConvert,
 				return HealthStatus.Green;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, HealthStatus value, JsonSerializerOptions options)
@@ -623,8 +639,7 @@ public override IBDistribution Read(ref Utf8JsonReader reader, Type typeToConver
 				return IBDistribution.Ll;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IBDistribution value, JsonSerializerOptions options)
@@ -665,8 +680,7 @@ public override IBLambda Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
 				return IBLambda.Df;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, IBLambda value, JsonSerializerOptions options)
@@ -711,8 +725,7 @@ public override Level Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe
 				return Level.Cluster;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, Level value, JsonSerializerOptions options)
@@ -804,8 +817,7 @@ public override NodeRole Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
 				return NodeRole.Client;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, NodeRole value, JsonSerializerOptions options)
@@ -894,8 +906,7 @@ public override Normalization Read(ref Utf8JsonReader reader, Type typeToConvert
 				return Normalization.H1;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, Normalization value, JsonSerializerOptions options)
@@ -957,8 +968,7 @@ public override Result Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
 				return Result.Created;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, Result value, JsonSerializerOptions options)
@@ -990,18 +1000,22 @@ public override void Write(Utf8JsonWriter writer, Result value, JsonSerializerOp
 public readonly partial struct ScriptLanguage
 {
 	public ScriptLanguage(string value) => Value = value;
-	public readonly string Value { get; }
 
+	public readonly string Value { get; }
 	public static ScriptLanguage Painless { get; } = new ScriptLanguage("painless");
 	public static ScriptLanguage Mustache { get; } = new ScriptLanguage("mustache");
 	public static ScriptLanguage Java { get; } = new ScriptLanguage("java");
 	public static ScriptLanguage Expression { get; } = new ScriptLanguage("expression");
+
 	public override string ToString() => Value ?? string.Empty;
+
 	public static implicit operator string(ScriptLanguage scriptLanguage) => scriptLanguage.Value;
 	public static implicit operator ScriptLanguage(string value) => new(value);
+
 	public override int GetHashCode() => Value.GetHashCode();
 	public override bool Equals(object obj) => obj is ScriptLanguage other && this.Equals(other);
 	public bool Equals(ScriptLanguage other) => Value == other.Value;
+
 	public static bool operator ==(ScriptLanguage a, ScriptLanguage b) => a.Equals(b);
 	public static bool operator !=(ScriptLanguage a, ScriptLanguage b) => !(a == b);
 }
@@ -1032,8 +1046,7 @@ public override ScriptSortType Read(ref Utf8JsonReader reader, Type typeToConver
 				return ScriptSortType.Number;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, ScriptSortType value, JsonSerializerOptions options)
@@ -1058,8 +1071,14 @@ public override void Write(Utf8JsonWriter writer, ScriptSortType value, JsonSeri
 [JsonConverter(typeof(SearchTypeConverter))]
 public enum SearchType
 {
+	/// <summary>
+	/// <para>Documents are scored using local term and document frequencies for the shard. This is usually faster but less accurate.</para>
+	/// </summary>
 	[EnumMember(Value = "query_then_fetch")]
 	QueryThenFetch,
+	/// <summary>
+	/// <para>Documents are scored using global term and document frequencies across all shards. This is usually slower but more accurate.</para>
+	/// </summary>
 	[EnumMember(Value = "dfs_query_then_fetch")]
 	DfsQueryThenFetch
 }
@@ -1077,8 +1096,7 @@ public override SearchType Read(ref Utf8JsonReader reader, Type typeToConvert, J
 				return SearchType.DfsQueryThenFetch;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SearchType value, JsonSerializerOptions options)
@@ -1100,6 +1118,9 @@ public override void Write(Utf8JsonWriter writer, SearchType value, JsonSerializ
 [JsonConverter(typeof(SlicesCalculationConverter))]
 public enum SlicesCalculation
 {
+	/// <summary>
+	/// <para>Let Elasticsearch choose a reasonable number for most data streams and indices.</para>
+	/// </summary>
 	[EnumMember(Value = "auto")]
 	Auto
 }
@@ -1115,8 +1136,7 @@ public override SlicesCalculation Read(ref Utf8JsonReader reader, Type typeToCon
 				return SlicesCalculation.Auto;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SlicesCalculation value, JsonSerializerOptions options)
@@ -1166,8 +1186,7 @@ public override SortMode Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
 				return SortMode.Avg;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SortMode value, JsonSerializerOptions options)
@@ -1217,8 +1236,7 @@ public override SortOrder Read(ref Utf8JsonReader reader, Type typeToConvert, Js
 				return SortOrder.Asc;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SortOrder value, JsonSerializerOptions options)
@@ -1263,8 +1281,7 @@ public override SuggestMode Read(ref Utf8JsonReader reader, Type typeToConvert,
 				return SuggestMode.Always;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, SuggestMode value, JsonSerializerOptions options)
@@ -1328,8 +1345,7 @@ public override TimeUnit Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
 				return TimeUnit.Days;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, TimeUnit value, JsonSerializerOptions options)
@@ -1393,8 +1409,7 @@ public override VersionType Read(ref Utf8JsonReader reader, Type typeToConvert,
 				return VersionType.External;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, VersionType value, JsonSerializerOptions options)
@@ -1457,8 +1472,7 @@ public override WaitForEvents Read(ref Utf8JsonReader reader, Type typeToConvert
 				return WaitForEvents.High;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, WaitForEvents value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryDsl.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryDsl.g.cs
index 8120e782e9d..e8389a3fedf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryDsl.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.QueryDsl.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,8 +24,8 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 [JsonConverter(typeof(ChildScoreModeConverter))]
 public enum ChildScoreMode
 {
@@ -58,8 +60,7 @@ public override ChildScoreMode Read(ref Utf8JsonReader reader, Type typeToConver
 				return ChildScoreMode.Avg;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, ChildScoreMode value, JsonSerializerOptions options)
@@ -109,8 +110,7 @@ public override CombinedFieldsOperator Read(ref Utf8JsonReader reader, Type type
 				return CombinedFieldsOperator.And;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, CombinedFieldsOperator value, JsonSerializerOptions options)
@@ -151,8 +151,7 @@ public override CombinedFieldsZeroTerms Read(ref Utf8JsonReader reader, Type typ
 				return CombinedFieldsZeroTerms.All;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, CombinedFieldsZeroTerms value, JsonSerializerOptions options)
@@ -225,8 +224,7 @@ public override FieldValueFactorModifier Read(ref Utf8JsonReader reader, Type ty
 				return FieldValueFactorModifier.Ln;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, FieldValueFactorModifier value, JsonSerializerOptions options)
@@ -307,8 +305,7 @@ public override FunctionBoostMode Read(ref Utf8JsonReader reader, Type typeToCon
 				return FunctionBoostMode.Avg;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, FunctionBoostMode value, JsonSerializerOptions options)
@@ -377,8 +374,7 @@ public override FunctionScoreMode Read(ref Utf8JsonReader reader, Type typeToCon
 				return FunctionScoreMode.Avg;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, FunctionScoreMode value, JsonSerializerOptions options)
@@ -435,8 +431,7 @@ public override GeoValidationMethod Read(ref Utf8JsonReader reader, Type typeToC
 				return GeoValidationMethod.Coerce;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, GeoValidationMethod value, JsonSerializerOptions options)
@@ -482,8 +477,7 @@ public override Operator Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
 				return Operator.And;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, Operator value, JsonSerializerOptions options)
@@ -528,8 +522,7 @@ public override RangeRelation Read(ref Utf8JsonReader reader, Type typeToConvert
 				return RangeRelation.Contains;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, RangeRelation value, JsonSerializerOptions options)
@@ -589,8 +582,7 @@ public override TextQueryType Read(ref Utf8JsonReader reader, Type typeToConvert
 				return TextQueryType.BestFields;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, TextQueryType value, JsonSerializerOptions options)
@@ -643,8 +635,7 @@ public override ZeroTermsQuery Read(ref Utf8JsonReader reader, Type typeToConver
 				return ZeroTermsQuery.All;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, ZeroTermsQuery value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Watcher.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Watcher.g.cs
index 8ab00273918..70296f8bf2a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Watcher.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.Watcher.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,8 +24,8 @@
 using Elastic.Transport;
 using Elastic.Clients.Elasticsearch.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Watcher;
+
 [JsonConverter(typeof(ActionStatusOptionsConverter))]
 public enum ActionStatusOptions
 {
@@ -54,8 +56,7 @@ public override ActionStatusOptions Read(ref Utf8JsonReader reader, Type typeToC
 				return ActionStatusOptions.Failure;
 		}
 
-		ThrowHelper.ThrowJsonException();
-		return default;
+		ThrowHelper.ThrowJsonException(); return default;
 	}
 
 	public override void Write(Utf8JsonWriter writer, ActionStatusOptions value, JsonSerializerOptions options)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/EqlHits.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/EqlHits.g.cs
index 9785194d24c..c0ea7cc9f90 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/EqlHits.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/EqlHits.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,25 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public sealed partial class EqlHits<TEvent>
 {
+	/// <summary>
+	/// <para>Contains events matching the query. Each object represents a matching event.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("events")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Eql.HitsEvent<TEvent>>? Events { get; init; }
 
+	/// <summary>
+	/// <para>Contains event sequences matching the query. Each object represents a matching sequence. This parameter is only returned for EQL queries containing a sequence.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("sequences")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Eql.HitsSequence<TEvent>>? Sequences { get; init; }
 
+	/// <summary>
+	/// <para>Metadata about the number of matching events or sequences.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("total")]
 	public Elastic.Clients.Elasticsearch.Core.Search.TotalHits? Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsEvent.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsEvent.g.cs
index 9d58f809378..ef89e85f249 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsEvent.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsEvent.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,27 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public sealed partial class HitsEvent<TEvent>
 {
+	/// <summary>
+	/// <para>Unique identifier for the event. This ID is only unique within the index.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_id")]
 	public string Id { get; init; }
 
+	/// <summary>
+	/// <para>Name of the index containing the event.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_index")]
 	public string Index { get; init; }
 
+	/// <summary>
+	/// <para>Original JSON body passed for the event at index time.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("_source")]
 	public TEvent Source { get; init; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	[ReadOnlyFieldDictionaryConverter(typeof(IReadOnlyCollection<object>))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, IReadOnlyCollection<object>>? Fields { get; init; }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsSequence.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsSequence.g.cs
index 0e33b016503..3b2781edfff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsSequence.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsSequence.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Eql;
+
 public sealed partial class HitsSequence<TEvent>
 {
+	/// <summary>
+	/// <para>Contains events matching the query. Each object represents a matching event.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("events")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Eql.HitsEvent<TEvent>> Events { get; init; }
 
+	/// <summary>
+	/// <para>Shared field values used to constrain matches in the sequence. These are defined using the by keyword in the EQL query syntax.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("join_keys")]
 	public IReadOnlyCollection<object> JoinKeys { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ErrorCause.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ErrorCause.g.cs
index dd9a8a2e196..9f3a54959c4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ErrorCause.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ErrorCause.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 internal sealed partial class ErrorCauseConverter : JsonConverter<ErrorCause>
 {
 	public override ErrorCause Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -85,16 +87,7 @@ public override ErrorCause Read(ref Utf8JsonReader reader, Type typeToConvert, J
 			}
 		}
 
-		return new ErrorCause
-		{
-			CausedBy = causedBy,
-			Reason = reason,
-			RootCause = rootCause,
-			StackTrace = stackTrace,
-			Suppressed = suppressed,
-			Type = type,
-			Metadata = additionalProperties
-		};
+		return new ErrorCause { CausedBy = causedBy, Reason = reason, RootCause = rootCause, StackTrace = stackTrace, Suppressed = suppressed, Type = type, Metadata = additionalProperties };
 	}
 
 	public override void Write(Utf8JsonWriter writer, ErrorCause value, JsonSerializerOptions options)
@@ -104,19 +97,28 @@ public override void Write(Utf8JsonWriter writer, ErrorCause value, JsonSerializ
 }
 
 [JsonConverter(typeof(ErrorCauseConverter))]
+/// <summary>
+/// <para>Cause and details about a request failure. This class defines the properties common to all error types.<br/>Additional details are also provided, that depend on the error type.</para>
+/// </summary>
 public sealed partial class ErrorCause
 {
 	public Elastic.Clients.Elasticsearch.ErrorCause? CausedBy { get; init; }
-
 	public IReadOnlyDictionary<string, object> Metadata { get; init; }
 
+	/// <summary>
+	/// <para>A human-readable explanation of the error, in english</para>
+	/// </summary>
 	public string? Reason { get; init; }
-
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>? RootCause { get; init; }
 
+	/// <summary>
+	/// <para>The server stack trace. Present only if the `error_trace=true` parameter was sent with the request.</para>
+	/// </summary>
 	public string? StackTrace { get; init; }
-
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ErrorCause>? Suppressed { get; init; }
 
+	/// <summary>
+	/// <para>The type of error</para>
+	/// </summary>
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ErrorResponseBase.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ErrorResponseBase.g.cs
index 07500b34eb3..6382f2122cb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ErrorResponseBase.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ErrorResponseBase.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport.Products.Elasticsearch;
@@ -24,13 +26,15 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
+/// <summary>
+/// <para>The response returned by Elasticsearch when request execution did not succeed.</para>
+/// </summary>
 public abstract partial class ErrorResponseBase
 {
 	[JsonInclude, JsonPropertyName("error")]
 	public Elastic.Clients.Elasticsearch.ErrorCause Error { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public int Status { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ExpandWildcardsConverter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ExpandWildcardsConverter.g.cs
index c0f3ecfd2ab..1c7a0abf5a1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ExpandWildcardsConverter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ExpandWildcardsConverter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 internal sealed class ExpandWildcardsConverter : SingleOrManyCollectionConverter<Elastic.Clients.Elasticsearch.ExpandWildcard>
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FeaturesConverter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FeaturesConverter.g.cs
index cf7ed23d502..18e3ec507e6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FeaturesConverter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FeaturesConverter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 internal sealed class FeaturesConverter : SingleOrManyCollectionConverter<Elastic.Clients.Elasticsearch.IndexManagement.Feature>
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldMemoryUsage.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldMemoryUsage.g.cs
index 4d89e5adef7..10e8984780b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldMemoryUsage.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldMemoryUsage.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class FieldMemoryUsage
 {
 	[JsonInclude, JsonPropertyName("memory_size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? MemorySize { get; init; }
-
 	[JsonInclude, JsonPropertyName("memory_size_in_bytes")]
 	public long MemorySizeInBytes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSizeUsage.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSizeUsage.g.cs
index a242e6912df..60c9509284a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSizeUsage.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSizeUsage.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class FieldSizeUsage
 {
 	[JsonInclude, JsonPropertyName("size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? Size { get; init; }
-
 	[JsonInclude, JsonPropertyName("size_in_bytes")]
 	public long SizeInBytes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs
index 624e41d1a2d..794755186b0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class FieldSort
 {
 	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
-
 	[JsonInclude, JsonPropertyName("missing")]
 	public FieldValue? Missing { get; set; }
-
 	[JsonInclude, JsonPropertyName("mode")]
 	public Elastic.Clients.Elasticsearch.SortMode? Mode { get; set; }
-
 	[JsonInclude, JsonPropertyName("nested")]
 	public Elastic.Clients.Elasticsearch.NestedSortValue? Nested { get; set; }
-
 	[JsonInclude, JsonPropertyName("numeric_type")]
 	public Elastic.Clients.Elasticsearch.FieldSortNumericType? NumericType { get; set; }
-
 	[JsonInclude, JsonPropertyName("order")]
 	public Elastic.Clients.Elasticsearch.SortOrder? Order { get; set; }
-
 	[JsonInclude, JsonPropertyName("unmapped_type")]
 	public Elastic.Clients.Elasticsearch.Mapping.FieldType? UnmappedType { get; set; }
 }
@@ -52,26 +48,19 @@ public sealed partial class FieldSort
 public sealed partial class FieldSortDescriptor<TDocument> : SerializableDescriptor<FieldSortDescriptor<TDocument>>
 {
 	internal FieldSortDescriptor(Action<FieldSortDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FieldSortDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.NestedSortValue? NestedValue { get; set; }
-
 	private NestedSortValueDescriptor<TDocument> NestedDescriptor { get; set; }
-
 	private Action<NestedSortValueDescriptor<TDocument>> NestedDescriptorAction { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortMode? ModeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.FieldSortNumericType? NumericTypeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortOrder? OrderValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.FieldType? UnmappedTypeValue { get; set; }
 
 	public FieldSortDescriptor<TDocument> Nested(Elastic.Clients.Elasticsearch.NestedSortValue? nested)
@@ -196,26 +185,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FieldSortDescriptor : SerializableDescriptor<FieldSortDescriptor>
 {
 	internal FieldSortDescriptor(Action<FieldSortDescriptor> configure) => configure.Invoke(this);
+
 	public FieldSortDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.NestedSortValue? NestedValue { get; set; }
-
 	private NestedSortValueDescriptor NestedDescriptor { get; set; }
-
 	private Action<NestedSortValueDescriptor> NestedDescriptorAction { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private FieldValue? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortMode? ModeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.FieldSortNumericType? NumericTypeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortOrder? OrderValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.FieldType? UnmappedTypeValue { get; set; }
 
 	public FieldSortDescriptor Nested(Elastic.Clients.Elasticsearch.NestedSortValue? nested)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FielddataStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FielddataStats.g.cs
index df15c53babb..f3328e0464e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FielddataStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FielddataStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,20 +25,17 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class FielddataStats
 {
 	[JsonInclude, JsonPropertyName("evictions")]
 	public long? Evictions { get; init; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	[ReadOnlyFieldDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.FieldMemoryUsage))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.Field, Elastic.Clients.Elasticsearch.FieldMemoryUsage>? Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("memory_size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? MemorySize { get; init; }
-
 	[JsonInclude, JsonPropertyName("memory_size_in_bytes")]
 	public long MemorySizeInBytes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FlushStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FlushStats.g.cs
index 4a084fe9547..c48aca3fca0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FlushStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FlushStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class FlushStats
 {
 	[JsonInclude, JsonPropertyName("periodic")]
 	public long Periodic { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public long Total { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_time")]
 	public Elastic.Clients.Elasticsearch.Duration? TotalTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_time_in_millis")]
 	public long TotalTimeInMillis { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Fuzziness.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Fuzziness.g.cs
index 6999834ac5b..44471ecc66d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Fuzziness.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Fuzziness.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class Fuzziness : Union<string, int>
 {
 	public Fuzziness(string fuzziness) : base(fuzziness)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoBounds.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoBounds.g.cs
index b9e8f80bcd8..5279e7b4923 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoBounds.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoBounds.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 [JsonConverter(typeof(GeoBoundsConverter))]
 public sealed partial class GeoBounds : IComplexUnion<GeoBounds.Kind>
 {
@@ -41,8 +43,11 @@ public enum Kind
 
 	private readonly Kind _kind;
 	private readonly object _value;
+
 	Kind IComplexUnion<Kind>.ValueKind => _kind;
+
 	object IComplexUnion<Kind>.Value => _value;
+
 	private GeoBounds(Kind kind, object value)
 	{
 		_kind = kind;
@@ -50,7 +55,9 @@ private GeoBounds(Kind kind, object value)
 	}
 
 	public static GeoBounds Coordinates(Elastic.Clients.Elasticsearch.CoordsGeoBounds coordinates) => new(Kind.Coordinates, coordinates);
+
 	public bool IsCoordinates => _kind == Kind.Coordinates;
+
 	public bool TryGetCoordinates([NotNullWhen(true)] out Elastic.Clients.Elasticsearch.CoordsGeoBounds? coordinates)
 	{
 		coordinates = null;
@@ -64,8 +71,11 @@ public bool TryGetCoordinates([NotNullWhen(true)] out Elastic.Clients.Elasticsea
 	}
 
 	public static implicit operator GeoBounds(Elastic.Clients.Elasticsearch.CoordsGeoBounds coordinates) => GeoBounds.Coordinates(coordinates);
+
 	public static GeoBounds TopLeftBottomRight(Elastic.Clients.Elasticsearch.TopLeftBottomRightGeoBounds topLeftBottomRight) => new(Kind.TopLeftBottomRight, topLeftBottomRight);
+
 	public bool IsTopLeftBottomRight => _kind == Kind.TopLeftBottomRight;
+
 	public bool TryGetTopLeftBottomRight([NotNullWhen(true)] out Elastic.Clients.Elasticsearch.TopLeftBottomRightGeoBounds? topLeftBottomRight)
 	{
 		topLeftBottomRight = null;
@@ -79,8 +89,11 @@ public bool TryGetTopLeftBottomRight([NotNullWhen(true)] out Elastic.Clients.Ela
 	}
 
 	public static implicit operator GeoBounds(Elastic.Clients.Elasticsearch.TopLeftBottomRightGeoBounds topLeftBottomRight) => GeoBounds.TopLeftBottomRight(topLeftBottomRight);
+
 	public static GeoBounds TopRightBottomLeft(Elastic.Clients.Elasticsearch.TopRightBottomLeftGeoBounds topRightBottomLeft) => new(Kind.TopRightBottomLeft, topRightBottomLeft);
+
 	public bool IsTopRightBottomLeft => _kind == Kind.TopRightBottomLeft;
+
 	public bool TryGetTopRightBottomLeft([NotNullWhen(true)] out Elastic.Clients.Elasticsearch.TopRightBottomLeftGeoBounds? topRightBottomLeft)
 	{
 		topRightBottomLeft = null;
@@ -94,8 +107,11 @@ public bool TryGetTopRightBottomLeft([NotNullWhen(true)] out Elastic.Clients.Ela
 	}
 
 	public static implicit operator GeoBounds(Elastic.Clients.Elasticsearch.TopRightBottomLeftGeoBounds topRightBottomLeft) => GeoBounds.TopRightBottomLeft(topRightBottomLeft);
+
 	public static GeoBounds Wkt(Elastic.Clients.Elasticsearch.WktGeoBounds wkt) => new(Kind.Wkt, wkt);
+
 	public bool IsWkt => _kind == Kind.Wkt;
+
 	public bool TryGetWkt([NotNullWhen(true)] out Elastic.Clients.Elasticsearch.WktGeoBounds? wkt)
 	{
 		wkt = null;
@@ -115,62 +131,8 @@ internal sealed class GeoBoundsConverter : MultiItemUnionConverter<GeoBounds, Ge
 {
 	public GeoBoundsConverter()
 	{
-		_types = new Dictionary<GeoBounds.Kind, Type>
-		{
-			{
-				GeoBounds.Kind.Coordinates,
-				typeof(Elastic.Clients.Elasticsearch.CoordsGeoBounds)
-			},
-			{
-				GeoBounds.Kind.TopLeftBottomRight,
-				typeof(Elastic.Clients.Elasticsearch.TopLeftBottomRightGeoBounds)
-			},
-			{
-				GeoBounds.Kind.TopRightBottomLeft,
-				typeof(Elastic.Clients.Elasticsearch.TopRightBottomLeftGeoBounds)
-			},
-			{
-				GeoBounds.Kind.Wkt,
-				typeof(Elastic.Clients.Elasticsearch.WktGeoBounds)
-			}
-		};
-		_factories = new Dictionary<Type, Func<object, GeoBounds>>
-		{
-			{
-				typeof(Elastic.Clients.Elasticsearch.CoordsGeoBounds),
-				o => GeoBounds.Coordinates((Elastic.Clients.Elasticsearch.CoordsGeoBounds)o)
-			},
-			{
-				typeof(Elastic.Clients.Elasticsearch.TopLeftBottomRightGeoBounds),
-				o => GeoBounds.TopLeftBottomRight((Elastic.Clients.Elasticsearch.TopLeftBottomRightGeoBounds)o)
-			},
-			{
-				typeof(Elastic.Clients.Elasticsearch.TopRightBottomLeftGeoBounds),
-				o => GeoBounds.TopRightBottomLeft((Elastic.Clients.Elasticsearch.TopRightBottomLeftGeoBounds)o)
-			},
-			{
-				typeof(Elastic.Clients.Elasticsearch.WktGeoBounds),
-				o => GeoBounds.Wkt((Elastic.Clients.Elasticsearch.WktGeoBounds)o)
-			}
-		};
-		_uniquePropertyToType = new Dictionary<string, Type>
-		{
-			{
-				"bottom",
-				typeof(Elastic.Clients.Elasticsearch.CoordsGeoBounds)
-			},
-			{
-				"bottom_right",
-				typeof(Elastic.Clients.Elasticsearch.TopLeftBottomRightGeoBounds)
-			},
-			{
-				"bottom_left",
-				typeof(Elastic.Clients.Elasticsearch.TopRightBottomLeftGeoBounds)
-			},
-			{
-				"wkt",
-				typeof(Elastic.Clients.Elasticsearch.WktGeoBounds)
-			}
-		};
+		_types = new Dictionary<GeoBounds.Kind, Type> { { GeoBounds.Kind.Coordinates, typeof(Elastic.Clients.Elasticsearch.CoordsGeoBounds) }, { GeoBounds.Kind.TopLeftBottomRight, typeof(Elastic.Clients.Elasticsearch.TopLeftBottomRightGeoBounds) }, { GeoBounds.Kind.TopRightBottomLeft, typeof(Elastic.Clients.Elasticsearch.TopRightBottomLeftGeoBounds) }, { GeoBounds.Kind.Wkt, typeof(Elastic.Clients.Elasticsearch.WktGeoBounds) } };
+		_factories = new Dictionary<Type, Func<object, GeoBounds>> { { typeof(Elastic.Clients.Elasticsearch.CoordsGeoBounds), o => GeoBounds.Coordinates((Elastic.Clients.Elasticsearch.CoordsGeoBounds)o) }, { typeof(Elastic.Clients.Elasticsearch.TopLeftBottomRightGeoBounds), o => GeoBounds.TopLeftBottomRight((Elastic.Clients.Elasticsearch.TopLeftBottomRightGeoBounds)o) }, { typeof(Elastic.Clients.Elasticsearch.TopRightBottomLeftGeoBounds), o => GeoBounds.TopRightBottomLeft((Elastic.Clients.Elasticsearch.TopRightBottomLeftGeoBounds)o) }, { typeof(Elastic.Clients.Elasticsearch.WktGeoBounds), o => GeoBounds.Wkt((Elastic.Clients.Elasticsearch.WktGeoBounds)o) } };
+		_uniquePropertyToType = new Dictionary<string, Type> { { "bottom", typeof(Elastic.Clients.Elasticsearch.CoordsGeoBounds) }, { "bottom_right", typeof(Elastic.Clients.Elasticsearch.TopLeftBottomRightGeoBounds) }, { "bottom_left", typeof(Elastic.Clients.Elasticsearch.TopRightBottomLeftGeoBounds) }, { "wkt", typeof(Elastic.Clients.Elasticsearch.WktGeoBounds) } };
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoDistanceSort.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoDistanceSort.g.cs
index bd688df19ca..3aaa947dc4e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoDistanceSort.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoDistanceSort.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 internal sealed partial class GeoDistanceSortConverter : JsonConverter<GeoDistanceSort>
 {
 	public override GeoDistanceSort Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -129,17 +131,11 @@ public override void Write(Utf8JsonWriter writer, GeoDistanceSort value, JsonSer
 public sealed partial class GeoDistanceSort
 {
 	public Elastic.Clients.Elasticsearch.GeoDistanceType? DistanceType { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	public bool? IgnoreUnmapped { get; set; }
-
 	public ICollection<Elastic.Clients.Elasticsearch.GeoLocation> Location { get; set; }
-
 	public Elastic.Clients.Elasticsearch.SortMode? Mode { get; set; }
-
 	public Elastic.Clients.Elasticsearch.SortOrder? Order { get; set; }
-
 	public Elastic.Clients.Elasticsearch.DistanceUnit? Unit { get; set; }
 
 	public static implicit operator SortOptions(GeoDistanceSort geoDistanceSort) => SortOptions.GeoDistance(geoDistanceSort);
@@ -148,22 +144,17 @@ public sealed partial class GeoDistanceSort
 public sealed partial class GeoDistanceSortDescriptor<TDocument> : SerializableDescriptor<GeoDistanceSortDescriptor<TDocument>>
 {
 	internal GeoDistanceSortDescriptor(Action<GeoDistanceSortDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GeoDistanceSortDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.GeoDistanceType? DistanceTypeValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortMode? ModeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortOrder? OrderValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DistanceUnit? UnitValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.GeoLocation> LocationValue { get; set; }
 
 	public GeoDistanceSortDescriptor<TDocument> DistanceType(Elastic.Clients.Elasticsearch.GeoDistanceType? distanceType)
@@ -261,22 +252,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class GeoDistanceSortDescriptor : SerializableDescriptor<GeoDistanceSortDescriptor>
 {
 	internal GeoDistanceSortDescriptor(Action<GeoDistanceSortDescriptor> configure) => configure.Invoke(this);
+
 	public GeoDistanceSortDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.GeoDistanceType? DistanceTypeValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortMode? ModeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortOrder? OrderValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DistanceUnit? UnitValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.GeoLocation> LocationValue { get; set; }
 
 	public GeoDistanceSortDescriptor DistanceType(Elastic.Clients.Elasticsearch.GeoDistanceType? distanceType)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoHashLocation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoHashLocation.g.cs
index 4ed2dad1331..3ee65168b82 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoHashLocation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoHashLocation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class GeoHashLocation
 {
 	[JsonInclude, JsonPropertyName("geohash")]
@@ -34,6 +36,7 @@ public sealed partial class GeoHashLocation
 public sealed partial class GeoHashLocationDescriptor : SerializableDescriptor<GeoHashLocationDescriptor>
 {
 	internal GeoHashLocationDescriptor(Action<GeoHashLocationDescriptor> configure) => configure.Invoke(this);
+
 	public GeoHashLocationDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoHashPrecision.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoHashPrecision.g.cs
index 676ab1629ec..81cfa3e88be 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoHashPrecision.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoHashPrecision.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class GeoHashPrecision : Union<double, string>
 {
 	public GeoHashPrecision(double geohash_length) : base(geohash_length)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoLocation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoLocation.g.cs
index f0e08984a1c..1af4db9dad7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoLocation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GeoLocation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 [JsonConverter(typeof(GeoLocationConverter))]
 public sealed partial class GeoLocation : IComplexUnion<GeoLocation.Kind>
 {
@@ -41,8 +43,11 @@ public enum Kind
 
 	private readonly Kind _kind;
 	private readonly object _value;
+
 	Kind IComplexUnion<Kind>.ValueKind => _kind;
+
 	object IComplexUnion<Kind>.Value => _value;
+
 	private GeoLocation(Kind kind, object value)
 	{
 		_kind = kind;
@@ -50,7 +55,9 @@ private GeoLocation(Kind kind, object value)
 	}
 
 	public static GeoLocation LatitudeLongitude(Elastic.Clients.Elasticsearch.LatLonGeoLocation latitudeLongitude) => new(Kind.LatitudeLongitude, latitudeLongitude);
+
 	public bool IsLatitudeLongitude => _kind == Kind.LatitudeLongitude;
+
 	public bool TryGetLatitudeLongitude([NotNullWhen(true)] out Elastic.Clients.Elasticsearch.LatLonGeoLocation? latitudeLongitude)
 	{
 		latitudeLongitude = null;
@@ -64,8 +71,11 @@ public bool TryGetLatitudeLongitude([NotNullWhen(true)] out Elastic.Clients.Elas
 	}
 
 	public static implicit operator GeoLocation(Elastic.Clients.Elasticsearch.LatLonGeoLocation latitudeLongitude) => GeoLocation.LatitudeLongitude(latitudeLongitude);
+
 	public static GeoLocation Geohash(Elastic.Clients.Elasticsearch.GeoHashLocation geohash) => new(Kind.Geohash, geohash);
+
 	public bool IsGeohash => _kind == Kind.Geohash;
+
 	public bool TryGetGeohash([NotNullWhen(true)] out Elastic.Clients.Elasticsearch.GeoHashLocation? geohash)
 	{
 		geohash = null;
@@ -79,8 +89,11 @@ public bool TryGetGeohash([NotNullWhen(true)] out Elastic.Clients.Elasticsearch.
 	}
 
 	public static implicit operator GeoLocation(Elastic.Clients.Elasticsearch.GeoHashLocation geohash) => GeoLocation.Geohash(geohash);
+
 	public static GeoLocation Coordinates(double[] coordinates) => new(Kind.Coordinates, coordinates);
+
 	public bool IsCoordinates => _kind == Kind.Coordinates;
+
 	public bool TryGetCoordinates([NotNullWhen(true)] out double[]? coordinates)
 	{
 		coordinates = null;
@@ -94,8 +107,11 @@ public bool TryGetCoordinates([NotNullWhen(true)] out double[]? coordinates)
 	}
 
 	public static implicit operator GeoLocation(double[] coordinates) => GeoLocation.Coordinates(coordinates);
+
 	public static GeoLocation Text(string text) => new(Kind.Text, text);
+
 	public bool IsText => _kind == Kind.Text;
+
 	public bool TryGetText([NotNullWhen(true)] out string? text)
 	{
 		text = null;
@@ -116,54 +132,8 @@ internal sealed class GeoLocationConverter : MultiItemUnionConverter<GeoLocation
 	public GeoLocationConverter()
 	{
 		_arrayType = typeof(double[]);
-		_types = new Dictionary<GeoLocation.Kind, Type>
-		{
-			{
-				GeoLocation.Kind.LatitudeLongitude,
-				typeof(Elastic.Clients.Elasticsearch.LatLonGeoLocation)
-			},
-			{
-				GeoLocation.Kind.Geohash,
-				typeof(Elastic.Clients.Elasticsearch.GeoHashLocation)
-			},
-			{
-				GeoLocation.Kind.Coordinates,
-				typeof(double[])
-			},
-			{
-				GeoLocation.Kind.Text,
-				typeof(string)
-			}
-		};
-		_factories = new Dictionary<Type, Func<object, GeoLocation>>
-		{
-			{
-				typeof(Elastic.Clients.Elasticsearch.LatLonGeoLocation),
-				o => GeoLocation.LatitudeLongitude((Elastic.Clients.Elasticsearch.LatLonGeoLocation)o)
-			},
-			{
-				typeof(Elastic.Clients.Elasticsearch.GeoHashLocation),
-				o => GeoLocation.Geohash((Elastic.Clients.Elasticsearch.GeoHashLocation)o)
-			},
-			{
-				typeof(double[]),
-				o => GeoLocation.Coordinates((double[])o)
-			},
-			{
-				typeof(string),
-				o => GeoLocation.Text((string)o)
-			}
-		};
-		_uniquePropertyToType = new Dictionary<string, Type>
-		{
-			{
-				"lat",
-				typeof(Elastic.Clients.Elasticsearch.LatLonGeoLocation)
-			},
-			{
-				"geohash",
-				typeof(Elastic.Clients.Elasticsearch.GeoHashLocation)
-			}
-		};
+		_types = new Dictionary<GeoLocation.Kind, Type> { { GeoLocation.Kind.LatitudeLongitude, typeof(Elastic.Clients.Elasticsearch.LatLonGeoLocation) }, { GeoLocation.Kind.Geohash, typeof(Elastic.Clients.Elasticsearch.GeoHashLocation) }, { GeoLocation.Kind.Coordinates, typeof(double[]) }, { GeoLocation.Kind.Text, typeof(string) } };
+		_factories = new Dictionary<Type, Func<object, GeoLocation>> { { typeof(Elastic.Clients.Elasticsearch.LatLonGeoLocation), o => GeoLocation.LatitudeLongitude((Elastic.Clients.Elasticsearch.LatLonGeoLocation)o) }, { typeof(Elastic.Clients.Elasticsearch.GeoHashLocation), o => GeoLocation.Geohash((Elastic.Clients.Elasticsearch.GeoHashLocation)o) }, { typeof(double[]), o => GeoLocation.Coordinates((double[])o) }, { typeof(string), o => GeoLocation.Text((string)o) } };
+		_uniquePropertyToType = new Dictionary<string, Type> { { "lat", typeof(Elastic.Clients.Elasticsearch.LatLonGeoLocation) }, { "geohash", typeof(Elastic.Clients.Elasticsearch.GeoHashLocation) } };
 	}
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GetStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GetStats.g.cs
index d1f6a656b6b..2a6e9c1bddf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/GetStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/GetStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class GetStats
 {
 	[JsonInclude, JsonPropertyName("current")]
 	public long Current { get; init; }
-
 	[JsonInclude, JsonPropertyName("exists_time")]
 	public Elastic.Clients.Elasticsearch.Duration? ExistsTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("exists_time_in_millis")]
 	public long ExistsTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("exists_total")]
 	public long ExistsTotal { get; init; }
-
 	[JsonInclude, JsonPropertyName("missing_time")]
 	public Elastic.Clients.Elasticsearch.Duration? MissingTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("missing_time_in_millis")]
 	public long MissingTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("missing_total")]
 	public long MissingTotal { get; init; }
-
 	[JsonInclude, JsonPropertyName("time")]
 	public Elastic.Clients.Elasticsearch.Duration? Time { get; init; }
-
 	[JsonInclude, JsonPropertyName("time_in_millis")]
 	public long TimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public long Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Action.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Action.g.cs
index 11c341ac29b..b2f26c608ae 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Action.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Action.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 [JsonConverter(typeof(ActionConverter))]
 public sealed partial class Action
 {
@@ -41,7 +43,6 @@ internal Action(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static Action Add(Elastic.Clients.Elasticsearch.IndexManagement.AddAction addAction) => new Action("add", addAction);
@@ -114,20 +115,17 @@ public override void Write(Utf8JsonWriter writer, Action value, JsonSerializerOp
 public sealed partial class ActionDescriptor<TDocument> : SerializableDescriptor<ActionDescriptor<TDocument>>
 {
 	internal ActionDescriptor(Action<ActionDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ActionDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private ActionDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private ActionDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -151,6 +149,7 @@ private ActionDescriptor<TDocument> Set(object variant, string variantName)
 	public ActionDescriptor<TDocument> Remove(Action<RemoveActionDescriptor> configure) => Set(configure, "remove");
 	public ActionDescriptor<TDocument> RemoveIndex(RemoveIndexAction removeIndexAction) => Set(removeIndexAction, "remove_index");
 	public ActionDescriptor<TDocument> RemoveIndex(Action<RemoveIndexActionDescriptor> configure) => Set(configure, "remove_index");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -176,20 +175,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ActionDescriptor : SerializableDescriptor<ActionDescriptor>
 {
 	internal ActionDescriptor(Action<ActionDescriptor> configure) => configure.Invoke(this);
+
 	public ActionDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private ActionDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private ActionDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -214,6 +210,7 @@ private ActionDescriptor Set(object variant, string variantName)
 	public ActionDescriptor Remove(Action<RemoveActionDescriptor> configure) => Set(configure, "remove");
 	public ActionDescriptor RemoveIndex(RemoveIndexAction removeIndexAction) => Set(removeIndexAction, "remove_index");
 	public ActionDescriptor RemoveIndex(Action<RemoveIndexActionDescriptor> configure) => Set(configure, "remove_index");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AddAction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AddAction.g.cs
index d7cf5d4de0a..21550950462 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AddAction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AddAction.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,40 +25,30 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class AddAction
 {
 	[JsonInclude, JsonPropertyName("alias")]
 	public Elastic.Clients.Elasticsearch.IndexAlias? Alias { get; set; }
-
 	[JsonInclude, JsonPropertyName("aliases"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.IndexAlias))]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexAlias>? Aliases { get; set; }
-
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_routing")]
 	public Elastic.Clients.Elasticsearch.Routing? IndexRouting { get; set; }
-
 	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Indices? Indices { get; set; }
-
 	[JsonInclude, JsonPropertyName("is_hidden")]
 	public bool? IsHidden { get; set; }
-
 	[JsonInclude, JsonPropertyName("is_write_index")]
 	public bool? IsWriteIndex { get; set; }
-
 	[JsonInclude, JsonPropertyName("must_exist")]
 	public bool? MustExist { get; set; }
-
 	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_routing")]
 	public Elastic.Clients.Elasticsearch.Routing? SearchRouting { get; set; }
 
@@ -66,34 +58,23 @@ public sealed partial class AddAction
 public sealed partial class AddActionDescriptor<TDocument> : SerializableDescriptor<AddActionDescriptor<TDocument>>
 {
 	internal AddActionDescriptor(Action<AddActionDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public AddActionDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexAlias? AliasValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.IndexAlias>? AliasesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? IndexRoutingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Indices? IndicesValue { get; set; }
-
 	private bool? IsHiddenValue { get; set; }
-
 	private bool? IsWriteIndexValue { get; set; }
-
 	private bool? MustExistValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? SearchRoutingValue { get; set; }
 
 	public AddActionDescriptor<TDocument> Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
@@ -266,34 +247,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class AddActionDescriptor : SerializableDescriptor<AddActionDescriptor>
 {
 	internal AddActionDescriptor(Action<AddActionDescriptor> configure) => configure.Invoke(this);
+
 	public AddActionDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexAlias? AliasValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.IndexAlias>? AliasesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? IndexRoutingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Indices? IndicesValue { get; set; }
-
 	private bool? IsHiddenValue { get; set; }
-
 	private bool? IsWriteIndexValue { get; set; }
-
 	private bool? MustExistValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? SearchRoutingValue { get; set; }
 
 	public AddActionDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Alias.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Alias.g.cs
index d46482c8373..b7e090f9ea3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Alias.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Alias.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class Alias
 {
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_routing")]
 	public Elastic.Clients.Elasticsearch.Routing? IndexRouting { get; set; }
-
 	[JsonInclude, JsonPropertyName("is_hidden")]
 	public bool? IsHidden { get; set; }
-
 	[JsonInclude, JsonPropertyName("is_write_index")]
 	public bool? IsWriteIndex { get; set; }
-
 	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_routing")]
 	public Elastic.Clients.Elasticsearch.Routing? SearchRouting { get; set; }
 }
@@ -49,24 +46,18 @@ public sealed partial class Alias
 public sealed partial class AliasDescriptor<TDocument> : SerializableDescriptor<AliasDescriptor<TDocument>>
 {
 	internal AliasDescriptor(Action<AliasDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public AliasDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? IndexRoutingValue { get; set; }
-
 	private bool? IsHiddenValue { get; set; }
-
 	private bool? IsWriteIndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? SearchRoutingValue { get; set; }
 
 	public AliasDescriptor<TDocument> Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
@@ -179,24 +170,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class AliasDescriptor : SerializableDescriptor<AliasDescriptor>
 {
 	internal AliasDescriptor(Action<AliasDescriptor> configure) => configure.Invoke(this);
+
 	public AliasDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? IndexRoutingValue { get; set; }
-
 	private bool? IsHiddenValue { get; set; }
-
 	private bool? IsWriteIndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? SearchRoutingValue { get; set; }
 
 	public AliasDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AliasDefinition.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AliasDefinition.g.cs
index d5f35957414..a781e33ba01 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AliasDefinition.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/AliasDefinition.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class AliasDefinition
 {
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_routing")]
 	public string? IndexRouting { get; set; }
-
 	[JsonInclude, JsonPropertyName("is_hidden")]
 	public bool? IsHidden { get; set; }
-
 	[JsonInclude, JsonPropertyName("is_write_index")]
 	public bool? IsWriteIndex { get; set; }
-
 	[JsonInclude, JsonPropertyName("routing")]
 	public string? Routing { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_routing")]
 	public string? SearchRouting { get; set; }
 }
@@ -49,24 +46,18 @@ public sealed partial class AliasDefinition
 public sealed partial class AliasDefinitionDescriptor<TDocument> : SerializableDescriptor<AliasDefinitionDescriptor<TDocument>>
 {
 	internal AliasDefinitionDescriptor(Action<AliasDefinitionDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public AliasDefinitionDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private string? IndexRoutingValue { get; set; }
-
 	private bool? IsHiddenValue { get; set; }
-
 	private bool? IsWriteIndexValue { get; set; }
-
 	private string? RoutingValue { get; set; }
-
 	private string? SearchRoutingValue { get; set; }
 
 	public AliasDefinitionDescriptor<TDocument> Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
@@ -179,24 +170,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class AliasDefinitionDescriptor : SerializableDescriptor<AliasDefinitionDescriptor>
 {
 	internal AliasDefinitionDescriptor(Action<AliasDefinitionDescriptor> configure) => configure.Invoke(this);
+
 	public AliasDefinitionDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private string? IndexRoutingValue { get; set; }
-
 	private bool? IsHiddenValue { get; set; }
-
 	private bool? IsWriteIndexValue { get; set; }
-
 	private string? RoutingValue { get; set; }
-
 	private string? SearchRoutingValue { get; set; }
 
 	public AliasDefinitionDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CacheQueries.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CacheQueries.g.cs
index a33d7e2438b..0bf5a0624d5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CacheQueries.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CacheQueries.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class CacheQueries
 {
 	[JsonInclude, JsonPropertyName("enabled")]
@@ -34,6 +36,7 @@ public sealed partial class CacheQueries
 public sealed partial class CacheQueriesDescriptor : SerializableDescriptor<CacheQueriesDescriptor>
 {
 	internal CacheQueriesDescriptor(Action<CacheQueriesDescriptor> configure) => configure.Invoke(this);
+
 	public CacheQueriesDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CloseIndexResult.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CloseIndexResult.g.cs
index d7f5adfa366..f1d144d6279 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CloseIndexResult.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CloseIndexResult.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class CloseIndexResult
 {
 	[JsonInclude, JsonPropertyName("closed")]
 	public bool Closed { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.IndexManagement.CloseShardResult>? Shards { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CloseShardResult.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CloseShardResult.g.cs
index 81f20576ffc..88a872cd3d0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CloseShardResult.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/CloseShardResult.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class CloseShardResult
 {
 	[JsonInclude, JsonPropertyName("failures")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStream.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStream.g.cs
index 4ab5f8d1015..7e1efa85495 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStream.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStream.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,43 +25,32 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class DataStream
 {
 	[JsonInclude, JsonPropertyName("_meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("allow_custom_routing")]
 	public bool? AllowCustomRouting { get; init; }
-
 	[JsonInclude, JsonPropertyName("generation")]
 	public int Generation { get; init; }
-
 	[JsonInclude, JsonPropertyName("hidden")]
 	public bool Hidden { get; init; }
-
 	[JsonInclude, JsonPropertyName("ilm_policy")]
 	public string? IlmPolicy { get; init; }
-
 	[JsonInclude, JsonPropertyName("indices")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.DataStreamIndex> Indices { get; init; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-
 	[JsonInclude, JsonPropertyName("replicated")]
 	public bool? Replicated { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.HealthStatus Status { get; init; }
-
 	[JsonInclude, JsonPropertyName("system")]
 	public bool? System { get; init; }
-
 	[JsonInclude, JsonPropertyName("template")]
 	public string Template { get; init; }
-
 	[JsonInclude, JsonPropertyName("timestamp_field")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.DataStreamTimestampField TimestampField { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamIndex.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamIndex.g.cs
index abce2353cec..ccc71af0e35 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamIndex.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamIndex.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class DataStreamIndex
 {
 	[JsonInclude, JsonPropertyName("index_name")]
 	public string IndexName { get; init; }
-
 	[JsonInclude, JsonPropertyName("index_uuid")]
 	public string IndexUuid { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamTimestampField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamTimestampField.g.cs
index de54fa6e543..2532cf47379 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamTimestampField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamTimestampField.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class DataStreamTimestampField
 {
 	[JsonInclude, JsonPropertyName("name")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamVisibility.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamVisibility.g.cs
index b69cb486bff..2982f6b3c1f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamVisibility.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/DataStreamVisibility.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class DataStreamVisibility
 {
 	[JsonInclude, JsonPropertyName("hidden")]
@@ -34,6 +36,7 @@ public sealed partial class DataStreamVisibility
 public sealed partial class DataStreamVisibilityDescriptor : SerializableDescriptor<DataStreamVisibilityDescriptor>
 {
 	internal DataStreamVisibilityDescriptor(Action<DataStreamVisibilityDescriptor> configure) => configure.Invoke(this);
+
 	public DataStreamVisibilityDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/FielddataFrequencyFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/FielddataFrequencyFilter.g.cs
index a579d4cf233..d535d05f2a0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/FielddataFrequencyFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/FielddataFrequencyFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class FielddataFrequencyFilter
 {
 	[JsonInclude, JsonPropertyName("max")]
 	public double Max { get; set; }
-
 	[JsonInclude, JsonPropertyName("min")]
 	public double Min { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_segment_size")]
 	public int MinSegmentSize { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class FielddataFrequencyFilter
 public sealed partial class FielddataFrequencyFilterDescriptor : SerializableDescriptor<FielddataFrequencyFilterDescriptor>, IBuildableDescriptor<FielddataFrequencyFilter>
 {
 	internal FielddataFrequencyFilterDescriptor(Action<FielddataFrequencyFilterDescriptor> configure) => configure.Invoke(this);
+
 	public FielddataFrequencyFilterDescriptor() : base()
 	{
 	}
 
 	private double MaxValue { get; set; }
-
 	private double MinValue { get; set; }
-
 	private int MinSegmentSizeValue { get; set; }
 
 	public FielddataFrequencyFilterDescriptor Max(double max)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexAliases.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexAliases.g.cs
index 595f7700cf6..e8797e9bfba 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexAliases.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexAliases.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexAliases
 {
 	[JsonInclude, JsonPropertyName("aliases")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexMappingRecord.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexMappingRecord.g.cs
index 1e1734f2b60..ecee9ebb4e8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexMappingRecord.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexMappingRecord.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexMappingRecord
 {
 	[JsonInclude, JsonPropertyName("item")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping? Item { get; init; }
-
 	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping Mappings { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRouting.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRouting.g.cs
index 5ad3c470bac..12b9b3185ad 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRouting.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRouting.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexRouting
 {
 	[JsonInclude, JsonPropertyName("allocation")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocation? Allocation { get; set; }
-
 	[JsonInclude, JsonPropertyName("rebalance")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingRebalance? Rebalance { get; set; }
 }
@@ -37,20 +38,16 @@ public sealed partial class IndexRouting
 public sealed partial class IndexRoutingDescriptor : SerializableDescriptor<IndexRoutingDescriptor>
 {
 	internal IndexRoutingDescriptor(Action<IndexRoutingDescriptor> configure) => configure.Invoke(this);
+
 	public IndexRoutingDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocation? AllocationValue { get; set; }
-
 	private IndexRoutingAllocationDescriptor AllocationDescriptor { get; set; }
-
 	private Action<IndexRoutingAllocationDescriptor> AllocationDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingRebalance? RebalanceValue { get; set; }
-
 	private IndexRoutingRebalanceDescriptor RebalanceDescriptor { get; set; }
-
 	private Action<IndexRoutingRebalanceDescriptor> RebalanceDescriptorAction { get; set; }
 
 	public IndexRoutingDescriptor Allocation(Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocation? allocation)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocation.g.cs
index 78dec2db012..8632087a75e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexRoutingAllocation
 {
 	[JsonInclude, JsonPropertyName("disk")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocationDisk? Disk { get; set; }
-
 	[JsonInclude, JsonPropertyName("enable")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocationOptions? Enable { get; set; }
-
 	[JsonInclude, JsonPropertyName("include")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocationInclude? Include { get; set; }
-
 	[JsonInclude, JsonPropertyName("initial_recovery")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocationInitialRecovery? InitialRecovery { get; set; }
 }
@@ -43,28 +42,20 @@ public sealed partial class IndexRoutingAllocation
 public sealed partial class IndexRoutingAllocationDescriptor : SerializableDescriptor<IndexRoutingAllocationDescriptor>
 {
 	internal IndexRoutingAllocationDescriptor(Action<IndexRoutingAllocationDescriptor> configure) => configure.Invoke(this);
+
 	public IndexRoutingAllocationDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocationDisk? DiskValue { get; set; }
-
 	private IndexRoutingAllocationDiskDescriptor DiskDescriptor { get; set; }
-
 	private Action<IndexRoutingAllocationDiskDescriptor> DiskDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocationOptions? EnableValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocationInclude? IncludeValue { get; set; }
-
 	private IndexRoutingAllocationIncludeDescriptor IncludeDescriptor { get; set; }
-
 	private Action<IndexRoutingAllocationIncludeDescriptor> IncludeDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocationInitialRecovery? InitialRecoveryValue { get; set; }
-
 	private IndexRoutingAllocationInitialRecoveryDescriptor InitialRecoveryDescriptor { get; set; }
-
 	private Action<IndexRoutingAllocationInitialRecoveryDescriptor> InitialRecoveryDescriptorAction { get; set; }
 
 	public IndexRoutingAllocationDescriptor Disk(Elastic.Clients.Elasticsearch.IndexManagement.IndexRoutingAllocationDisk? disk)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationDisk.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationDisk.g.cs
index 27dfedde819..b82d8e8c416 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationDisk.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationDisk.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexRoutingAllocationDisk
 {
 	[JsonInclude, JsonPropertyName("threshold_enabled")]
@@ -34,6 +36,7 @@ public sealed partial class IndexRoutingAllocationDisk
 public sealed partial class IndexRoutingAllocationDiskDescriptor : SerializableDescriptor<IndexRoutingAllocationDiskDescriptor>
 {
 	internal IndexRoutingAllocationDiskDescriptor(Action<IndexRoutingAllocationDiskDescriptor> configure) => configure.Invoke(this);
+
 	public IndexRoutingAllocationDiskDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationInclude.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationInclude.g.cs
index a762adcdcc3..8ec4e908e7e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationInclude.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationInclude.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexRoutingAllocationInclude
 {
 	[JsonInclude, JsonPropertyName("_id")]
 	public Elastic.Clients.Elasticsearch.Id? Id { get; set; }
-
 	[JsonInclude, JsonPropertyName("_tier_preference")]
 	public string? TierPreference { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class IndexRoutingAllocationInclude
 public sealed partial class IndexRoutingAllocationIncludeDescriptor : SerializableDescriptor<IndexRoutingAllocationIncludeDescriptor>
 {
 	internal IndexRoutingAllocationIncludeDescriptor(Action<IndexRoutingAllocationIncludeDescriptor> configure) => configure.Invoke(this);
+
 	public IndexRoutingAllocationIncludeDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Id? IdValue { get; set; }
-
 	private string? TierPreferenceValue { get; set; }
 
 	public IndexRoutingAllocationIncludeDescriptor Id(Elastic.Clients.Elasticsearch.Id? id)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationInitialRecovery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationInitialRecovery.g.cs
index 450d298012f..10a57cbf20f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationInitialRecovery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingAllocationInitialRecovery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexRoutingAllocationInitialRecovery
 {
 	[JsonInclude, JsonPropertyName("_id")]
@@ -34,6 +36,7 @@ public sealed partial class IndexRoutingAllocationInitialRecovery
 public sealed partial class IndexRoutingAllocationInitialRecoveryDescriptor : SerializableDescriptor<IndexRoutingAllocationInitialRecoveryDescriptor>
 {
 	internal IndexRoutingAllocationInitialRecoveryDescriptor(Action<IndexRoutingAllocationInitialRecoveryDescriptor> configure) => configure.Invoke(this);
+
 	public IndexRoutingAllocationInitialRecoveryDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingRebalance.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingRebalance.g.cs
index bf62f909fae..4a0c0ecb835 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingRebalance.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexRoutingRebalance.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexRoutingRebalance
 {
 	[JsonInclude, JsonPropertyName("enable")]
@@ -34,6 +36,7 @@ public sealed partial class IndexRoutingRebalance
 public sealed partial class IndexRoutingRebalanceDescriptor : SerializableDescriptor<IndexRoutingRebalanceDescriptor>
 {
 	internal IndexRoutingRebalanceDescriptor(Action<IndexRoutingRebalanceDescriptor> configure) => configure.Invoke(this);
+
 	public IndexRoutingRebalanceDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSegmentSort.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSegmentSort.g.cs
index bf5569e5f7a..59844e8ec9a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSegmentSort.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSegmentSort.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexSegmentSort
 {
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Fields? Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("missing"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMissing))]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMissing>? Missing { get; set; }
-
 	[JsonInclude, JsonPropertyName("mode"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMode))]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMode>? Mode { get; set; }
-
 	[JsonInclude, JsonPropertyName("order"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortOrder))]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortOrder>? Order { get; set; }
 }
@@ -43,16 +42,14 @@ public sealed partial class IndexSegmentSort
 public sealed partial class IndexSegmentSortDescriptor<TDocument> : SerializableDescriptor<IndexSegmentSortDescriptor<TDocument>>
 {
 	internal IndexSegmentSortDescriptor(Action<IndexSegmentSortDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IndexSegmentSortDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? FieldValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMissing>? MissingValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMode>? ModeValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortOrder>? OrderValue { get; set; }
 
 	public IndexSegmentSortDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Fields? field)
@@ -113,16 +110,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IndexSegmentSortDescriptor : SerializableDescriptor<IndexSegmentSortDescriptor>
 {
 	internal IndexSegmentSortDescriptor(Action<IndexSegmentSortDescriptor> configure) => configure.Invoke(this);
+
 	public IndexSegmentSortDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? FieldValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMissing>? MissingValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortMode>? ModeValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.IndexManagement.SegmentSortOrder>? OrderValue { get; set; }
 
 	public IndexSegmentSortDescriptor Field(Elastic.Clients.Elasticsearch.Fields? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingBlocks.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingBlocks.g.cs
index 2abb0eec62e..78a197ed72f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingBlocks.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingBlocks.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexSettingBlocks
 {
 	[JsonInclude, JsonPropertyName("metadata")]
 	public bool? Metadata { get; set; }
-
 	[JsonInclude, JsonPropertyName("read")]
 	public bool? Read { get; set; }
-
 	[JsonInclude, JsonPropertyName("read_only")]
 	public bool? ReadOnly { get; set; }
-
 	[JsonInclude, JsonPropertyName("read_only_allow_delete")]
 	public bool? ReadOnlyAllowDelete { get; set; }
-
 	[JsonInclude, JsonPropertyName("write")]
 	public Union<bool?, string?>? Write { get; set; }
 }
@@ -46,18 +44,15 @@ public sealed partial class IndexSettingBlocks
 public sealed partial class IndexSettingBlocksDescriptor : SerializableDescriptor<IndexSettingBlocksDescriptor>
 {
 	internal IndexSettingBlocksDescriptor(Action<IndexSettingBlocksDescriptor> configure) => configure.Invoke(this);
+
 	public IndexSettingBlocksDescriptor() : base()
 	{
 	}
 
 	private bool? MetadataValue { get; set; }
-
 	private bool? ReadValue { get; set; }
-
 	private bool? ReadOnlyValue { get; set; }
-
 	private bool? ReadOnlyAllowDeleteValue { get; set; }
-
 	private Union<bool?, string?>? WriteValue { get; set; }
 
 	public IndexSettingBlocksDescriptor Metadata(bool? metadata = true)
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 2ca1bec82cd..185449ce0a5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettings.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettings.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 internal sealed partial class IndexSettingsConverter : JsonConverter<IndexSettings>
 {
 	public override IndexSettings Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -753,331 +755,194 @@ public sealed partial class IndexSettings
 {
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsAnalysis? Analysis { get; set; }
 
+	/// <summary>
+	/// <para>Settings to define analyzers, tokenizers, token filters and character filters.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsAnalyze? Analyze { get; set; }
-
 	public string? AutoExpandReplicas { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingBlocks? Blocks { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexCheckOnStartup? CheckOnStartup { get; set; }
-
 	public string? Codec { get; set; }
-
 	[JsonConverter(typeof(StringifiedLongConverter))]
 	public long? CreationDate { get; set; }
-
 	public DateTimeOffset? CreationDateString { get; set; }
-
 	public string? DefaultPipeline { get; set; }
-
 	public string? FinalPipeline { get; set; }
-
 	public Union<string?, int?>? Format { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Duration? GcDeletes { get; set; }
-
 	public Union<bool?, string?>? Hidden { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsHighlight? Highlight { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? Index { get; set; }
 
+	/// <summary>
+	/// <para>Configure indexing back pressure limits.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexingPressure? IndexingPressure { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.SlowlogSettings? IndexingSlowlog { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsLifecycle? Lifecycle { get; set; }
-
 	public bool? LoadFixedBitsetFiltersEagerly { get; set; }
 
+	/// <summary>
+	/// <para>Enable or disable dynamic mapping for an index.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettings? Mapping { get; set; }
-
 	public int? MaxDocvalueFieldsSearch { get; set; }
-
 	public int? MaxInnerResultWindow { get; set; }
-
 	public int? MaxNgramDiff { get; set; }
-
 	public int? MaxRefreshListeners { get; set; }
-
 	public int? MaxRegexLength { get; set; }
-
 	public int? MaxRescoreWindow { get; set; }
-
 	public int? MaxResultWindow { get; set; }
-
 	public int? MaxScriptFields { get; set; }
-
 	public int? MaxShingleDiff { get; set; }
-
 	public int? MaxSlicesPerScroll { get; set; }
-
 	public int? MaxTermsCount { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.Merge? Merge { get; set; }
-
 	public string? Mode { get; set; }
-
 	public Union<int?, string?>? NumberOfReplicas { get; set; }
-
 	public int? NumberOfRoutingShards { get; set; }
-
 	public Union<int?, string?>? NumberOfShards { get; set; }
-
 	public IDictionary<string, object> OtherSettings { get; set; }
-
 	public Union<int?, string?>? Priority { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Name? ProvidedName { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.Queries? Queries { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsQueryString? QueryString { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Duration? RefreshInterval { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexRouting? Routing { get; set; }
-
 	public int? RoutingPartitionSize { get; set; }
-
 	public ICollection<string>? RoutingPath { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsSearch? Search { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? Settings { get; set; }
-
 	public int? Shards { get; set; }
 
+	/// <summary>
+	/// <para>Configure custom similarity settings to customize how search results are scored.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarity? Similarity { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.SoftDeletes? SoftDeletes { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSegmentSort? Sort { get; set; }
 
+	/// <summary>
+	/// <para>The store module allows you to control how index data is stored and accessed on disk.</para>
+	/// </summary>
 	public Elastic.Clients.Elasticsearch.IndexManagement.Storage? Store { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsTimeSeries? TimeSeries { get; set; }
-
 	public int? TopMetricsMaxSize { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.Translog? Translog { get; set; }
-
 	public string? Uuid { get; set; }
-
 	public Union<bool?, string?>? VerifiedBeforeClose { get; set; }
-
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexVersioning? Version { get; set; }
 }
 
 public sealed partial class IndexSettingsDescriptor<TDocument> : SerializableDescriptor<IndexSettingsDescriptor<TDocument>>
 {
 	internal IndexSettingsDescriptor(Action<IndexSettingsDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IndexSettingsDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? IndexValue { get; set; }
-
 	private IndexSettingsDescriptor<TDocument> IndexDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor<TDocument>> IndexDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? SettingsValue { get; set; }
-
 	private IndexSettingsDescriptor<TDocument> SettingsDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor<TDocument>> SettingsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSegmentSort? SortValue { get; set; }
-
 	private IndexSegmentSortDescriptor<TDocument> SortDescriptor { get; set; }
-
 	private Action<IndexSegmentSortDescriptor<TDocument>> SortDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsAnalysis? AnalysisValue { get; set; }
-
 	private IndexSettingsAnalysisDescriptor AnalysisDescriptor { get; set; }
-
 	private Action<IndexSettingsAnalysisDescriptor> AnalysisDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsAnalyze? AnalyzeValue { get; set; }
-
 	private SettingsAnalyzeDescriptor AnalyzeDescriptor { get; set; }
-
 	private Action<SettingsAnalyzeDescriptor> AnalyzeDescriptorAction { get; set; }
-
 	private string? AutoExpandReplicasValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingBlocks? BlocksValue { get; set; }
-
 	private IndexSettingBlocksDescriptor BlocksDescriptor { get; set; }
-
 	private Action<IndexSettingBlocksDescriptor> BlocksDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexCheckOnStartup? CheckOnStartupValue { get; set; }
-
 	private string? CodecValue { get; set; }
-
 	private long? CreationDateValue { get; set; }
-
 	private DateTimeOffset? CreationDateStringValue { get; set; }
-
 	private string? DefaultPipelineValue { get; set; }
-
 	private string? FinalPipelineValue { get; set; }
-
 	private Union<string?, int?>? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? GcDeletesValue { get; set; }
-
 	private Union<bool?, string?>? HiddenValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsHighlight? HighlightValue { get; set; }
-
 	private SettingsHighlightDescriptor HighlightDescriptor { get; set; }
-
 	private Action<SettingsHighlightDescriptor> HighlightDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexingPressure? IndexingPressureValue { get; set; }
-
 	private IndexingPressureDescriptor IndexingPressureDescriptor { get; set; }
-
 	private Action<IndexingPressureDescriptor> IndexingPressureDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SlowlogSettings? IndexingSlowlogValue { get; set; }
-
 	private SlowlogSettingsDescriptor IndexingSlowlogDescriptor { get; set; }
-
 	private Action<SlowlogSettingsDescriptor> IndexingSlowlogDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsLifecycle? LifecycleValue { get; set; }
-
 	private IndexSettingsLifecycleDescriptor LifecycleDescriptor { get; set; }
-
 	private Action<IndexSettingsLifecycleDescriptor> LifecycleDescriptorAction { get; set; }
-
 	private bool? LoadFixedBitsetFiltersEagerlyValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettings? MappingValue { get; set; }
-
 	private MappingLimitSettingsDescriptor MappingDescriptor { get; set; }
-
 	private Action<MappingLimitSettingsDescriptor> MappingDescriptorAction { get; set; }
-
 	private int? MaxDocvalueFieldsSearchValue { get; set; }
-
 	private int? MaxInnerResultWindowValue { get; set; }
-
 	private int? MaxNgramDiffValue { get; set; }
-
 	private int? MaxRefreshListenersValue { get; set; }
-
 	private int? MaxRegexLengthValue { get; set; }
-
 	private int? MaxRescoreWindowValue { get; set; }
-
 	private int? MaxResultWindowValue { get; set; }
-
 	private int? MaxScriptFieldsValue { get; set; }
-
 	private int? MaxShingleDiffValue { get; set; }
-
 	private int? MaxSlicesPerScrollValue { get; set; }
-
 	private int? MaxTermsCountValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.Merge? MergeValue { get; set; }
-
 	private MergeDescriptor MergeDescriptor { get; set; }
-
 	private Action<MergeDescriptor> MergeDescriptorAction { get; set; }
-
 	private string? ModeValue { get; set; }
-
 	private Union<int?, string?>? NumberOfReplicasValue { get; set; }
-
 	private int? NumberOfRoutingShardsValue { get; set; }
-
 	private Union<int?, string?>? NumberOfShardsValue { get; set; }
-
 	private IDictionary<string, object> OtherSettingsValue { get; set; }
-
 	private Union<int?, string?>? PriorityValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Name? ProvidedNameValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.Queries? QueriesValue { get; set; }
-
 	private QueriesDescriptor QueriesDescriptor { get; set; }
-
 	private Action<QueriesDescriptor> QueriesDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsQueryString? QueryStringValue { get; set; }
-
 	private SettingsQueryStringDescriptor QueryStringDescriptor { get; set; }
-
 	private Action<SettingsQueryStringDescriptor> QueryStringDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? RefreshIntervalValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexRouting? RoutingValue { get; set; }
-
 	private IndexRoutingDescriptor RoutingDescriptor { get; set; }
-
 	private Action<IndexRoutingDescriptor> RoutingDescriptorAction { get; set; }
-
 	private int? RoutingPartitionSizeValue { get; set; }
-
 	private ICollection<string>? RoutingPathValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsSearch? SearchValue { get; set; }
-
 	private SettingsSearchDescriptor SearchDescriptor { get; set; }
-
 	private Action<SettingsSearchDescriptor> SearchDescriptorAction { get; set; }
-
 	private int? ShardsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarity? SimilarityValue { get; set; }
-
 	private SettingsSimilarityDescriptor SimilarityDescriptor { get; set; }
-
 	private Action<SettingsSimilarityDescriptor> SimilarityDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SoftDeletes? SoftDeletesValue { get; set; }
-
 	private SoftDeletesDescriptor SoftDeletesDescriptor { get; set; }
-
 	private Action<SoftDeletesDescriptor> SoftDeletesDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.Storage? StoreValue { get; set; }
-
 	private StorageDescriptor StoreDescriptor { get; set; }
-
 	private Action<StorageDescriptor> StoreDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsTimeSeries? TimeSeriesValue { get; set; }
-
 	private IndexSettingsTimeSeriesDescriptor TimeSeriesDescriptor { get; set; }
-
 	private Action<IndexSettingsTimeSeriesDescriptor> TimeSeriesDescriptorAction { get; set; }
-
 	private int? TopMetricsMaxSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.Translog? TranslogValue { get; set; }
-
 	private TranslogDescriptor TranslogDescriptor { get; set; }
-
 	private Action<TranslogDescriptor> TranslogDescriptorAction { get; set; }
-
 	private string? UuidValue { get; set; }
-
 	private Union<bool?, string?>? VerifiedBeforeCloseValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexVersioning? VersionValue { get; set; }
-
 	private IndexVersioningDescriptor VersionDescriptor { get; set; }
-
 	private Action<IndexVersioningDescriptor> VersionDescriptorAction { get; set; }
 
 	public IndexSettingsDescriptor<TDocument> Index(Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? index)
@@ -1176,6 +1041,9 @@ public IndexSettingsDescriptor<TDocument> Analysis(Action<IndexSettingsAnalysisD
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Settings to define analyzers, tokenizers, token filters and character filters.</para>
+	/// </summary>
 	public IndexSettingsDescriptor<TDocument> Analyze(Elastic.Clients.Elasticsearch.IndexManagement.SettingsAnalyze? analyze)
 	{
 		AnalyzeDescriptor = null;
@@ -1308,6 +1176,9 @@ public IndexSettingsDescriptor<TDocument> Highlight(Action<SettingsHighlightDesc
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Configure indexing back pressure limits.</para>
+	/// </summary>
 	public IndexSettingsDescriptor<TDocument> IndexingPressure(Elastic.Clients.Elasticsearch.IndexManagement.IndexingPressure? indexingPressure)
 	{
 		IndexingPressureDescriptor = null;
@@ -1386,6 +1257,9 @@ public IndexSettingsDescriptor<TDocument> LoadFixedBitsetFiltersEagerly(bool? lo
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Enable or disable dynamic mapping for an index.</para>
+	/// </summary>
 	public IndexSettingsDescriptor<TDocument> Mapping(Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettings? mapping)
 	{
 		MappingDescriptor = null;
@@ -1662,6 +1536,9 @@ public IndexSettingsDescriptor<TDocument> Shards(int? shards)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Configure custom similarity settings to customize how search results are scored.</para>
+	/// </summary>
 	public IndexSettingsDescriptor<TDocument> Similarity(Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarity? similarity)
 	{
 		SimilarityDescriptor = null;
@@ -1710,6 +1587,9 @@ public IndexSettingsDescriptor<TDocument> SoftDeletes(Action<SoftDeletesDescript
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The store module allows you to control how index data is stored and accessed on disk.</para>
+	/// </summary>
 	public IndexSettingsDescriptor<TDocument> Store(Elastic.Clients.Elasticsearch.IndexManagement.Storage? store)
 	{
 		StoreDescriptor = null;
@@ -2405,212 +2285,112 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IndexSettingsDescriptor : SerializableDescriptor<IndexSettingsDescriptor>
 {
 	internal IndexSettingsDescriptor(Action<IndexSettingsDescriptor> configure) => configure.Invoke(this);
+
 	public IndexSettingsDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? IndexValue { get; set; }
-
 	private IndexSettingsDescriptor IndexDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor> IndexDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? SettingsValue { get; set; }
-
 	private IndexSettingsDescriptor SettingsDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor> SettingsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSegmentSort? SortValue { get; set; }
-
 	private IndexSegmentSortDescriptor SortDescriptor { get; set; }
-
 	private Action<IndexSegmentSortDescriptor> SortDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsAnalysis? AnalysisValue { get; set; }
-
 	private IndexSettingsAnalysisDescriptor AnalysisDescriptor { get; set; }
-
 	private Action<IndexSettingsAnalysisDescriptor> AnalysisDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsAnalyze? AnalyzeValue { get; set; }
-
 	private SettingsAnalyzeDescriptor AnalyzeDescriptor { get; set; }
-
 	private Action<SettingsAnalyzeDescriptor> AnalyzeDescriptorAction { get; set; }
-
 	private string? AutoExpandReplicasValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingBlocks? BlocksValue { get; set; }
-
 	private IndexSettingBlocksDescriptor BlocksDescriptor { get; set; }
-
 	private Action<IndexSettingBlocksDescriptor> BlocksDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexCheckOnStartup? CheckOnStartupValue { get; set; }
-
 	private string? CodecValue { get; set; }
-
 	private long? CreationDateValue { get; set; }
-
 	private DateTimeOffset? CreationDateStringValue { get; set; }
-
 	private string? DefaultPipelineValue { get; set; }
-
 	private string? FinalPipelineValue { get; set; }
-
 	private Union<string?, int?>? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? GcDeletesValue { get; set; }
-
 	private Union<bool?, string?>? HiddenValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsHighlight? HighlightValue { get; set; }
-
 	private SettingsHighlightDescriptor HighlightDescriptor { get; set; }
-
 	private Action<SettingsHighlightDescriptor> HighlightDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexingPressure? IndexingPressureValue { get; set; }
-
 	private IndexingPressureDescriptor IndexingPressureDescriptor { get; set; }
-
 	private Action<IndexingPressureDescriptor> IndexingPressureDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SlowlogSettings? IndexingSlowlogValue { get; set; }
-
 	private SlowlogSettingsDescriptor IndexingSlowlogDescriptor { get; set; }
-
 	private Action<SlowlogSettingsDescriptor> IndexingSlowlogDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsLifecycle? LifecycleValue { get; set; }
-
 	private IndexSettingsLifecycleDescriptor LifecycleDescriptor { get; set; }
-
 	private Action<IndexSettingsLifecycleDescriptor> LifecycleDescriptorAction { get; set; }
-
 	private bool? LoadFixedBitsetFiltersEagerlyValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettings? MappingValue { get; set; }
-
 	private MappingLimitSettingsDescriptor MappingDescriptor { get; set; }
-
 	private Action<MappingLimitSettingsDescriptor> MappingDescriptorAction { get; set; }
-
 	private int? MaxDocvalueFieldsSearchValue { get; set; }
-
 	private int? MaxInnerResultWindowValue { get; set; }
-
 	private int? MaxNgramDiffValue { get; set; }
-
 	private int? MaxRefreshListenersValue { get; set; }
-
 	private int? MaxRegexLengthValue { get; set; }
-
 	private int? MaxRescoreWindowValue { get; set; }
-
 	private int? MaxResultWindowValue { get; set; }
-
 	private int? MaxScriptFieldsValue { get; set; }
-
 	private int? MaxShingleDiffValue { get; set; }
-
 	private int? MaxSlicesPerScrollValue { get; set; }
-
 	private int? MaxTermsCountValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.Merge? MergeValue { get; set; }
-
 	private MergeDescriptor MergeDescriptor { get; set; }
-
 	private Action<MergeDescriptor> MergeDescriptorAction { get; set; }
-
 	private string? ModeValue { get; set; }
-
 	private Union<int?, string?>? NumberOfReplicasValue { get; set; }
-
 	private int? NumberOfRoutingShardsValue { get; set; }
-
 	private Union<int?, string?>? NumberOfShardsValue { get; set; }
-
 	private IDictionary<string, object> OtherSettingsValue { get; set; }
-
 	private Union<int?, string?>? PriorityValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Name? ProvidedNameValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.Queries? QueriesValue { get; set; }
-
 	private QueriesDescriptor QueriesDescriptor { get; set; }
-
 	private Action<QueriesDescriptor> QueriesDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsQueryString? QueryStringValue { get; set; }
-
 	private SettingsQueryStringDescriptor QueryStringDescriptor { get; set; }
-
 	private Action<SettingsQueryStringDescriptor> QueryStringDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? RefreshIntervalValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexRouting? RoutingValue { get; set; }
-
 	private IndexRoutingDescriptor RoutingDescriptor { get; set; }
-
 	private Action<IndexRoutingDescriptor> RoutingDescriptorAction { get; set; }
-
 	private int? RoutingPartitionSizeValue { get; set; }
-
 	private ICollection<string>? RoutingPathValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsSearch? SearchValue { get; set; }
-
 	private SettingsSearchDescriptor SearchDescriptor { get; set; }
-
 	private Action<SettingsSearchDescriptor> SearchDescriptorAction { get; set; }
-
 	private int? ShardsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarity? SimilarityValue { get; set; }
-
 	private SettingsSimilarityDescriptor SimilarityDescriptor { get; set; }
-
 	private Action<SettingsSimilarityDescriptor> SimilarityDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SoftDeletes? SoftDeletesValue { get; set; }
-
 	private SoftDeletesDescriptor SoftDeletesDescriptor { get; set; }
-
 	private Action<SoftDeletesDescriptor> SoftDeletesDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.Storage? StoreValue { get; set; }
-
 	private StorageDescriptor StoreDescriptor { get; set; }
-
 	private Action<StorageDescriptor> StoreDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsTimeSeries? TimeSeriesValue { get; set; }
-
 	private IndexSettingsTimeSeriesDescriptor TimeSeriesDescriptor { get; set; }
-
 	private Action<IndexSettingsTimeSeriesDescriptor> TimeSeriesDescriptorAction { get; set; }
-
 	private int? TopMetricsMaxSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.Translog? TranslogValue { get; set; }
-
 	private TranslogDescriptor TranslogDescriptor { get; set; }
-
 	private Action<TranslogDescriptor> TranslogDescriptorAction { get; set; }
-
 	private string? UuidValue { get; set; }
-
 	private Union<bool?, string?>? VerifiedBeforeCloseValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexVersioning? VersionValue { get; set; }
-
 	private IndexVersioningDescriptor VersionDescriptor { get; set; }
-
 	private Action<IndexVersioningDescriptor> VersionDescriptorAction { get; set; }
 
 	public IndexSettingsDescriptor Index(Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? index)
@@ -2709,6 +2489,9 @@ public IndexSettingsDescriptor Analysis(Action<IndexSettingsAnalysisDescriptor>
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Settings to define analyzers, tokenizers, token filters and character filters.</para>
+	/// </summary>
 	public IndexSettingsDescriptor Analyze(Elastic.Clients.Elasticsearch.IndexManagement.SettingsAnalyze? analyze)
 	{
 		AnalyzeDescriptor = null;
@@ -2841,6 +2624,9 @@ public IndexSettingsDescriptor Highlight(Action<SettingsHighlightDescriptor> con
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Configure indexing back pressure limits.</para>
+	/// </summary>
 	public IndexSettingsDescriptor IndexingPressure(Elastic.Clients.Elasticsearch.IndexManagement.IndexingPressure? indexingPressure)
 	{
 		IndexingPressureDescriptor = null;
@@ -2919,6 +2705,9 @@ public IndexSettingsDescriptor LoadFixedBitsetFiltersEagerly(bool? loadFixedBits
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Enable or disable dynamic mapping for an index.</para>
+	/// </summary>
 	public IndexSettingsDescriptor Mapping(Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettings? mapping)
 	{
 		MappingDescriptor = null;
@@ -3195,6 +2984,9 @@ public IndexSettingsDescriptor Shards(int? shards)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Configure custom similarity settings to customize how search results are scored.</para>
+	/// </summary>
 	public IndexSettingsDescriptor Similarity(Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarity? similarity)
 	{
 		SimilarityDescriptor = null;
@@ -3243,6 +3035,9 @@ public IndexSettingsDescriptor SoftDeletes(Action<SoftDeletesDescriptor> configu
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The store module allows you to control how index data is stored and accessed on disk.</para>
+	/// </summary>
 	public IndexSettingsDescriptor Store(Elastic.Clients.Elasticsearch.IndexManagement.Storage? store)
 	{
 		StoreDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsAnalysis.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsAnalysis.g.cs
index 7c568babd19..16081bbc69c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsAnalysis.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsAnalysis.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexSettingsAnalysis
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public Elastic.Clients.Elasticsearch.Analysis.Analyzers? Analyzers { get; set; }
-
 	[JsonInclude, JsonPropertyName("char_filter")]
 	public Elastic.Clients.Elasticsearch.Analysis.CharFilters? CharFilters { get; set; }
-
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.Analysis.TokenFilters? TokenFilters { get; set; }
-
 	[JsonInclude, JsonPropertyName("normalizer")]
 	public Elastic.Clients.Elasticsearch.Analysis.Normalizers? Normalizers { get; set; }
-
 	[JsonInclude, JsonPropertyName("tokenizer")]
 	public Elastic.Clients.Elasticsearch.Analysis.Tokenizers? Tokenizers { get; set; }
 }
@@ -46,18 +44,15 @@ public sealed partial class IndexSettingsAnalysis
 public sealed partial class IndexSettingsAnalysisDescriptor : SerializableDescriptor<IndexSettingsAnalysisDescriptor>
 {
 	internal IndexSettingsAnalysisDescriptor(Action<IndexSettingsAnalysisDescriptor> configure) => configure.Invoke(this);
+
 	public IndexSettingsAnalysisDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Analysis.Analyzers? AnalyzersValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.CharFilters? CharFiltersValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.TokenFilters? TokenFiltersValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.Normalizers? NormalizersValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Analysis.Tokenizers? TokenizersValue { get; set; }
 
 	public IndexSettingsAnalysisDescriptor Analyzers(Elastic.Clients.Elasticsearch.Analysis.Analyzers? analyzers)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsLifecycle.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsLifecycle.g.cs
index 48773cf366c..bee57871c6e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsLifecycle.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsLifecycle.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,39 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexSettingsLifecycle
 {
+	/// <summary>
+	/// <para>Indicates whether or not the index has been rolled over. Automatically set to true when ILM completes the rollover action.<br/>You can explicitly set it to skip rollover.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("indexing_complete")]
 	public bool? IndexingComplete { get; set; }
 
+	/// <summary>
+	/// <para>The name of the policy to use to manage the index. For information about how Elasticsearch applies policy changes, see Policy updates.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("name")]
 	public Elastic.Clients.Elasticsearch.Name Name { get; set; }
 
+	/// <summary>
+	/// <para>If specified, this is the timestamp used to calculate the index age for its phase transitions. Use this setting<br/>if you create a new index that contains old data and want to use the original creation date to calculate the index<br/>age. Specified as a Unix epoch value in milliseconds.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("origination_date")]
 	public long? OriginationDate { get; set; }
 
+	/// <summary>
+	/// <para>Set to true to parse the origination date from the index name. This origination date is used to calculate the index age<br/>for its phase transitions. The index name must match the pattern ^.*-{date_format}-\\d+, where the date_format is<br/>yyyy.MM.dd and the trailing digits are optional. An index that was rolled over would normally match the full format,<br/>for example logs-2016.10.31-000002). If the index name doesn’t match the pattern, index creation fails.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("parse_origination_date")]
 	public bool? ParseOriginationDate { get; set; }
 
+	/// <summary>
+	/// <para>The index alias to update when the index rolls over. Specify when using a policy that contains a rollover action.<br/>When the index rolls over, the alias is updated to reflect that the index is no longer the write index. For more<br/>information about rolling indices, see Rollover.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("rollover_alias")]
 	public string? RolloverAlias { get; set; }
-
 	[JsonInclude, JsonPropertyName("step")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsLifecycleStep? Step { get; set; }
 }
@@ -49,50 +65,59 @@ public sealed partial class IndexSettingsLifecycle
 public sealed partial class IndexSettingsLifecycleDescriptor : SerializableDescriptor<IndexSettingsLifecycleDescriptor>
 {
 	internal IndexSettingsLifecycleDescriptor(Action<IndexSettingsLifecycleDescriptor> configure) => configure.Invoke(this);
+
 	public IndexSettingsLifecycleDescriptor() : base()
 	{
 	}
 
 	private bool? IndexingCompleteValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Name NameValue { get; set; }
-
 	private long? OriginationDateValue { get; set; }
-
 	private bool? ParseOriginationDateValue { get; set; }
-
 	private string? RolloverAliasValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettingsLifecycleStep? StepValue { get; set; }
-
 	private IndexSettingsLifecycleStepDescriptor StepDescriptor { get; set; }
-
 	private Action<IndexSettingsLifecycleStepDescriptor> StepDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>Indicates whether or not the index has been rolled over. Automatically set to true when ILM completes the rollover action.<br/>You can explicitly set it to skip rollover.</para>
+	/// </summary>
 	public IndexSettingsLifecycleDescriptor IndexingComplete(bool? indexingComplete = true)
 	{
 		IndexingCompleteValue = indexingComplete;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The name of the policy to use to manage the index. For information about how Elasticsearch applies policy changes, see Policy updates.</para>
+	/// </summary>
 	public IndexSettingsLifecycleDescriptor Name(Elastic.Clients.Elasticsearch.Name name)
 	{
 		NameValue = name;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>If specified, this is the timestamp used to calculate the index age for its phase transitions. Use this setting<br/>if you create a new index that contains old data and want to use the original creation date to calculate the index<br/>age. Specified as a Unix epoch value in milliseconds.</para>
+	/// </summary>
 	public IndexSettingsLifecycleDescriptor OriginationDate(long? originationDate)
 	{
 		OriginationDateValue = originationDate;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Set to true to parse the origination date from the index name. This origination date is used to calculate the index age<br/>for its phase transitions. The index name must match the pattern ^.*-{date_format}-\\d+, where the date_format is<br/>yyyy.MM.dd and the trailing digits are optional. An index that was rolled over would normally match the full format,<br/>for example logs-2016.10.31-000002). If the index name doesn’t match the pattern, index creation fails.</para>
+	/// </summary>
 	public IndexSettingsLifecycleDescriptor ParseOriginationDate(bool? parseOriginationDate = true)
 	{
 		ParseOriginationDateValue = parseOriginationDate;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The index alias to update when the index rolls over. Specify when using a policy that contains a rollover action.<br/>When the index rolls over, the alias is updated to reflect that the index is no longer the write index. For more<br/>information about rolling indices, see Rollover.</para>
+	/// </summary>
 	public IndexSettingsLifecycleDescriptor RolloverAlias(string? rolloverAlias)
 	{
 		RolloverAliasValue = rolloverAlias;
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 26330e51ad8..f196298ed72 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsLifecycleStep.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsLifecycleStep.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,10 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexSettingsLifecycleStep
 {
+	/// <summary>
+	/// <para>Time to wait for the cluster to resolve allocation issues during an ILM shrink action. Must be greater than 1h (1 hour).<br/>See Shard allocation for shrink.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("wait_time_threshold")]
 	public Elastic.Clients.Elasticsearch.Duration? WaitTimeThreshold { get; set; }
 }
@@ -34,12 +39,16 @@ public sealed partial class IndexSettingsLifecycleStep
 public sealed partial class IndexSettingsLifecycleStepDescriptor : SerializableDescriptor<IndexSettingsLifecycleStepDescriptor>
 {
 	internal IndexSettingsLifecycleStepDescriptor(Action<IndexSettingsLifecycleStepDescriptor> configure) => configure.Invoke(this);
+
 	public IndexSettingsLifecycleStepDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Duration? WaitTimeThresholdValue { get; set; }
 
+	/// <summary>
+	/// <para>Time to wait for the cluster to resolve allocation issues during an ILM shrink action. Must be greater than 1h (1 hour).<br/>See Shard allocation for shrink.</para>
+	/// </summary>
 	public IndexSettingsLifecycleStepDescriptor WaitTimeThreshold(Elastic.Clients.Elasticsearch.Duration? waitTimeThreshold)
 	{
 		WaitTimeThresholdValue = waitTimeThreshold;
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 6666ba48ea6..262bd30a159 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsTimeSeries.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexSettingsTimeSeries.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexSettingsTimeSeries
 {
 	[JsonInclude, JsonPropertyName("end_time")]
 	public DateTimeOffset? EndTime { get; set; }
-
 	[JsonInclude, JsonPropertyName("start_time")]
 	public DateTimeOffset? StartTime { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class IndexSettingsTimeSeries
 public sealed partial class IndexSettingsTimeSeriesDescriptor : SerializableDescriptor<IndexSettingsTimeSeriesDescriptor>
 {
 	internal IndexSettingsTimeSeriesDescriptor(Action<IndexSettingsTimeSeriesDescriptor> configure) => configure.Invoke(this);
+
 	public IndexSettingsTimeSeriesDescriptor() : base()
 	{
 	}
 
 	private DateTimeOffset? EndTimeValue { get; set; }
-
 	private DateTimeOffset? StartTimeValue { get; set; }
 
 	public IndexSettingsTimeSeriesDescriptor EndTime(DateTimeOffset? endTime)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexState.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexState.g.cs
index 45456c9f0c3..b1730451d7b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexState.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexState.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexState
 {
 	[JsonInclude, JsonPropertyName("aliases")]
 	public IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? Aliases { get; set; }
-
 	[JsonInclude, JsonPropertyName("data_stream")]
 	public Elastic.Clients.Elasticsearch.DataStreamName? DataStream { get; set; }
 
+	/// <summary>
+	/// <para>Default settings, included when the request's `include_default` is `true`.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("defaults")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? Defaults { get; set; }
-
 	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping? Mappings { get; set; }
-
 	[JsonInclude, JsonPropertyName("settings")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? Settings { get; set; }
 }
@@ -46,32 +48,26 @@ public sealed partial class IndexState
 public sealed partial class IndexStateDescriptor<TDocument> : SerializableDescriptor<IndexStateDescriptor<TDocument>>
 {
 	internal IndexStateDescriptor(Action<IndexStateDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IndexStateDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? DefaultsValue { get; set; }
-
 	private IndexSettingsDescriptor<TDocument> DefaultsDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor<TDocument>> DefaultsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TypeMapping? MappingsValue { get; set; }
-
 	private Mapping.TypeMappingDescriptor<TDocument> MappingsDescriptor { get; set; }
-
 	private Action<Mapping.TypeMappingDescriptor<TDocument>> MappingsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? SettingsValue { get; set; }
-
 	private IndexSettingsDescriptor<TDocument> SettingsDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor<TDocument>> SettingsDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DataStreamName? DataStreamValue { get; set; }
 
+	/// <summary>
+	/// <para>Default settings, included when the request's `include_default` is `true`.</para>
+	/// </summary>
 	public IndexStateDescriptor<TDocument> Defaults(Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? defaults)
 	{
 		DefaultsDescriptor = null;
@@ -226,32 +222,26 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IndexStateDescriptor : SerializableDescriptor<IndexStateDescriptor>
 {
 	internal IndexStateDescriptor(Action<IndexStateDescriptor> configure) => configure.Invoke(this);
+
 	public IndexStateDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? DefaultsValue { get; set; }
-
 	private IndexSettingsDescriptor DefaultsDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor> DefaultsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TypeMapping? MappingsValue { get; set; }
-
 	private Mapping.TypeMappingDescriptor MappingsDescriptor { get; set; }
-
 	private Action<Mapping.TypeMappingDescriptor> MappingsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? SettingsValue { get; set; }
-
 	private IndexSettingsDescriptor SettingsDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor> SettingsDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DataStreamName? DataStreamValue { get; set; }
 
+	/// <summary>
+	/// <para>Default settings, included when the request's `include_default` is `true`.</para>
+	/// </summary>
 	public IndexStateDescriptor Defaults(Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? defaults)
 	{
 		DefaultsDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexStats.g.cs
index 1043ab977a2..4407016db84 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,64 +25,114 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexStats
 {
 	[JsonInclude, JsonPropertyName("bulk")]
 	public Elastic.Clients.Elasticsearch.BulkStats? Bulk { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about completions across all shards assigned to the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("completion")]
 	public Elastic.Clients.Elasticsearch.CompletionStats? Completion { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about documents across all primary shards assigned to the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("docs")]
 	public Elastic.Clients.Elasticsearch.DocStats? Docs { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about the field data cache across all shards assigned to the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("fielddata")]
 	public Elastic.Clients.Elasticsearch.FielddataStats? Fielddata { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about flush operations for the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("flush")]
 	public Elastic.Clients.Elasticsearch.FlushStats? Flush { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about get operations for the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("get")]
 	public Elastic.Clients.Elasticsearch.GetStats? Get { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about indexing operations for the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("indexing")]
 	public Elastic.Clients.Elasticsearch.IndexingStats? Indexing { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about indices operations for the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndicesStats? Indices { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about merge operations for the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("merges")]
 	public Elastic.Clients.Elasticsearch.MergesStats? Merges { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about the query cache across all shards assigned to the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("query_cache")]
 	public Elastic.Clients.Elasticsearch.QueryCacheStats? QueryCache { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about recovery operations for the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("recovery")]
 	public Elastic.Clients.Elasticsearch.RecoveryStats? Recovery { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about refresh operations for the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("refresh")]
 	public Elastic.Clients.Elasticsearch.RefreshStats? Refresh { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about the request cache across all shards assigned to the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("request_cache")]
 	public Elastic.Clients.Elasticsearch.RequestCacheStats? RequestCache { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about search operations for the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("search")]
 	public Elastic.Clients.Elasticsearch.SearchStats? Search { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about segments across all shards assigned to the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("segments")]
 	public Elastic.Clients.Elasticsearch.SegmentsStats? Segments { get; init; }
-
 	[JsonInclude, JsonPropertyName("shard_stats")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardsTotalStats? ShardStats { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about the size of shards assigned to the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("store")]
 	public Elastic.Clients.Elasticsearch.StoreStats? Store { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about transaction log operations for the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("translog")]
 	public Elastic.Clients.Elasticsearch.TranslogStats? Translog { get; init; }
 
+	/// <summary>
+	/// <para>Contains statistics about index warming operations for the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("warmer")]
 	public Elastic.Clients.Elasticsearch.WarmerStats? Warmer { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplate.g.cs
index b7389df0aef..94476e1ab53 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexTemplate
 {
 	[JsonInclude, JsonPropertyName("_meta")]
 	public IReadOnlyDictionary<string, object>? Meta { get; init; }
-
 	[JsonInclude, JsonPropertyName("allow_auto_create")]
 	public bool? AllowAutoCreate { get; init; }
-
 	[JsonInclude, JsonPropertyName("composed_of")]
 	public IReadOnlyCollection<string> ComposedOf { get; init; }
-
 	[JsonInclude, JsonPropertyName("data_stream")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateDataStreamConfiguration? DataStream { get; init; }
-
 	[JsonInclude, JsonPropertyName("index_patterns")]
 	public IReadOnlyCollection<string> IndexPatterns { get; init; }
-
 	[JsonInclude, JsonPropertyName("priority")]
 	public long? Priority { get; init; }
-
 	[JsonInclude, JsonPropertyName("template")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplateSummary? 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/IndexManagement/IndexTemplateDataStreamConfiguration.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateDataStreamConfiguration.g.cs
index 4db2ee540e2..a81d35c5bd8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateDataStreamConfiguration.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateDataStreamConfiguration.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexTemplateDataStreamConfiguration
 {
+	/// <summary>
+	/// <para>If true, the data stream supports custom routing.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("allow_custom_routing")]
 	public bool? AllowCustomRouting { get; init; }
 
+	/// <summary>
+	/// <para>If true, the data stream is hidden.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("hidden")]
 	public bool? Hidden { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateItem.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateItem.g.cs
index a89e4c5a396..0d18b704f1d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateItem.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateItem.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexTemplateItem
 {
 	[JsonInclude, JsonPropertyName("index_template")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexTemplate IndexTemplate { get; init; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateMapping.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateMapping.g.cs
index 66e2d4913ce..e962fc7f820 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateMapping.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateMapping.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexTemplateMapping
 {
 	[JsonInclude, JsonPropertyName("aliases")]
 	public IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? Aliases { get; set; }
-
 	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping? Mappings { get; set; }
-
 	[JsonInclude, JsonPropertyName("settings")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? Settings { get; set; }
 }
@@ -40,22 +40,17 @@ public sealed partial class IndexTemplateMapping
 public sealed partial class IndexTemplateMappingDescriptor<TDocument> : SerializableDescriptor<IndexTemplateMappingDescriptor<TDocument>>
 {
 	internal IndexTemplateMappingDescriptor(Action<IndexTemplateMappingDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IndexTemplateMappingDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.TypeMapping? MappingsValue { get; set; }
-
 	private Mapping.TypeMappingDescriptor<TDocument> MappingsDescriptor { get; set; }
-
 	private Action<Mapping.TypeMappingDescriptor<TDocument>> MappingsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? SettingsValue { get; set; }
-
 	private IndexSettingsDescriptor<TDocument> SettingsDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor<TDocument>> SettingsDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
 
 	public IndexTemplateMappingDescriptor<TDocument> Mappings(Elastic.Clients.Elasticsearch.Mapping.TypeMapping? mappings)
@@ -160,22 +155,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IndexTemplateMappingDescriptor : SerializableDescriptor<IndexTemplateMappingDescriptor>
 {
 	internal IndexTemplateMappingDescriptor(Action<IndexTemplateMappingDescriptor> configure) => configure.Invoke(this);
+
 	public IndexTemplateMappingDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.TypeMapping? MappingsValue { get; set; }
-
 	private Mapping.TypeMappingDescriptor MappingsDescriptor { get; set; }
-
 	private Action<Mapping.TypeMappingDescriptor> MappingsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? SettingsValue { get; set; }
-
 	private IndexSettingsDescriptor SettingsDescriptor { get; set; }
-
 	private Action<IndexSettingsDescriptor> SettingsDescriptorAction { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? AliasesValue { get; set; }
 
 	public IndexTemplateMappingDescriptor Mappings(Elastic.Clients.Elasticsearch.Mapping.TypeMapping? mappings)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateSummary.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateSummary.g.cs
index b2414bc04d2..9f26130d1d9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateSummary.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexTemplateSummary.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,17 +25,15 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexTemplateSummary
 {
 	[JsonInclude, JsonPropertyName("aliases")]
 	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.IndexManagement.Alias))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias>? Aliases { get; init; }
-
 	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping? Mappings { get; init; }
-
 	[JsonInclude, JsonPropertyName("settings")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings? Settings { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexVersioning.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexVersioning.g.cs
index ab76b7942bb..f710b5dd0be 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexVersioning.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexVersioning.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexVersioning
 {
 	[JsonInclude, JsonPropertyName("created")]
 	public string? Created { get; set; }
-
 	[JsonInclude, JsonPropertyName("created_string")]
 	public string? CreatedString { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class IndexVersioning
 public sealed partial class IndexVersioningDescriptor : SerializableDescriptor<IndexVersioningDescriptor>
 {
 	internal IndexVersioningDescriptor(Action<IndexVersioningDescriptor> configure) => configure.Invoke(this);
+
 	public IndexVersioningDescriptor() : base()
 	{
 	}
 
 	private string? CreatedValue { get; set; }
-
 	private string? CreatedStringValue { get; set; }
 
 	public IndexVersioningDescriptor Created(string? created)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexingPressure.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexingPressure.g.cs
index c385788331f..d9d21ed8503 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexingPressure.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexingPressure.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexingPressure
 {
 	[JsonInclude, JsonPropertyName("memory")]
@@ -34,14 +36,13 @@ public sealed partial class IndexingPressure
 public sealed partial class IndexingPressureDescriptor : SerializableDescriptor<IndexingPressureDescriptor>
 {
 	internal IndexingPressureDescriptor(Action<IndexingPressureDescriptor> configure) => configure.Invoke(this);
+
 	public IndexingPressureDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.IndexingPressureMemory MemoryValue { get; set; }
-
 	private IndexingPressureMemoryDescriptor MemoryDescriptor { get; set; }
-
 	private Action<IndexingPressureMemoryDescriptor> MemoryDescriptorAction { get; set; }
 
 	public IndexingPressureDescriptor Memory(Elastic.Clients.Elasticsearch.IndexManagement.IndexingPressureMemory memory)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexingPressureMemory.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexingPressureMemory.g.cs
index 5cc057c054b..09d7e1c2386 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexingPressureMemory.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndexingPressureMemory.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,10 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndexingPressureMemory
 {
+	/// <summary>
+	/// <para>Number of outstanding bytes that may be consumed by indexing requests. When this limit is reached or exceeded,<br/>the node will reject new coordinating and primary operations. When replica operations consume 1.5x this limit,<br/>the node will reject new replica operations. Defaults to 10% of the heap.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("limit")]
 	public int? Limit { get; set; }
 }
@@ -34,12 +39,16 @@ public sealed partial class IndexingPressureMemory
 public sealed partial class IndexingPressureMemoryDescriptor : SerializableDescriptor<IndexingPressureMemoryDescriptor>
 {
 	internal IndexingPressureMemoryDescriptor(Action<IndexingPressureMemoryDescriptor> configure) => configure.Invoke(this);
+
 	public IndexingPressureMemoryDescriptor() : base()
 	{
 	}
 
 	private int? LimitValue { get; set; }
 
+	/// <summary>
+	/// <para>Number of outstanding bytes that may be consumed by indexing requests. When this limit is reached or exceeded,<br/>the node will reject new coordinating and primary operations. When replica operations consume 1.5x this limit,<br/>the node will reject new replica operations. Defaults to 10% of the heap.</para>
+	/// </summary>
 	public IndexingPressureMemoryDescriptor Limit(int? limit)
 	{
 		LimitValue = limit;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndicesStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndicesStats.g.cs
index eaa39f83872..e50c989d36b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndicesStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/IndicesStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class IndicesStats
 {
 	[JsonInclude, JsonPropertyName("health")]
 	public Elastic.Clients.Elasticsearch.HealthStatus? Health { get; init; }
-
 	[JsonInclude, JsonPropertyName("primaries")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexStats? Primaries { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards")]
 	public IReadOnlyDictionary<string, IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.ShardStats>>? Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexMetadataState? Status { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexStats? Total { get; init; }
-
 	[JsonInclude, JsonPropertyName("uuid")]
 	public string? Uuid { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettings.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettings.g.cs
index ce8afcacfa7..2b9bac0c930 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettings.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettings.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,80 +25,61 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
+/// <summary>
+/// <para>Mapping Limit Settings</para>
+/// </summary>
 public sealed partial class MappingLimitSettings
 {
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("depth")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsDepth? Depth { get; set; }
-
 	[JsonInclude, JsonPropertyName("dimension_fields")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsDimensionFields? DimensionFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("field_name_length")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsFieldNameLength? FieldNameLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("nested_fields")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsNestedFields? NestedFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("nested_objects")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsNestedObjects? NestedObjects { get; set; }
-
 	[JsonInclude, JsonPropertyName("total_fields")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsTotalFields? TotalFields { get; set; }
 }
 
+/// <summary>
+/// <para>Mapping Limit Settings</para>
+/// </summary>
 public sealed partial class MappingLimitSettingsDescriptor : SerializableDescriptor<MappingLimitSettingsDescriptor>
 {
 	internal MappingLimitSettingsDescriptor(Action<MappingLimitSettingsDescriptor> configure) => configure.Invoke(this);
+
 	public MappingLimitSettingsDescriptor() : base()
 	{
 	}
 
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsDepth? DepthValue { get; set; }
-
 	private MappingLimitSettingsDepthDescriptor DepthDescriptor { get; set; }
-
 	private Action<MappingLimitSettingsDepthDescriptor> DepthDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsDimensionFields? DimensionFieldsValue { get; set; }
-
 	private MappingLimitSettingsDimensionFieldsDescriptor DimensionFieldsDescriptor { get; set; }
-
 	private Action<MappingLimitSettingsDimensionFieldsDescriptor> DimensionFieldsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsFieldNameLength? FieldNameLengthValue { get; set; }
-
 	private MappingLimitSettingsFieldNameLengthDescriptor FieldNameLengthDescriptor { get; set; }
-
 	private Action<MappingLimitSettingsFieldNameLengthDescriptor> FieldNameLengthDescriptorAction { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsNestedFields? NestedFieldsValue { get; set; }
-
 	private MappingLimitSettingsNestedFieldsDescriptor NestedFieldsDescriptor { get; set; }
-
 	private Action<MappingLimitSettingsNestedFieldsDescriptor> NestedFieldsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsNestedObjects? NestedObjectsValue { get; set; }
-
 	private MappingLimitSettingsNestedObjectsDescriptor NestedObjectsDescriptor { get; set; }
-
 	private Action<MappingLimitSettingsNestedObjectsDescriptor> NestedObjectsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.MappingLimitSettingsTotalFields? TotalFieldsValue { get; set; }
-
 	private MappingLimitSettingsTotalFieldsDescriptor TotalFieldsDescriptor { get; set; }
-
 	private Action<MappingLimitSettingsTotalFieldsDescriptor> TotalFieldsDescriptorAction { get; set; }
 
 	public MappingLimitSettingsDescriptor Coerce(bool? coerce = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsDepth.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsDepth.g.cs
index 7563b280201..3a8d524a8ce 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsDepth.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsDepth.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,10 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class MappingLimitSettingsDepth
 {
+	/// <summary>
+	/// <para>The maximum depth for a field, which is measured as the number of inner objects. For instance, if all fields are defined<br/>at the root object level, then the depth is 1. If there is one object mapping, then the depth is 2, etc.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("limit")]
 	public int? Limit { get; set; }
 }
@@ -34,12 +39,16 @@ public sealed partial class MappingLimitSettingsDepth
 public sealed partial class MappingLimitSettingsDepthDescriptor : SerializableDescriptor<MappingLimitSettingsDepthDescriptor>
 {
 	internal MappingLimitSettingsDepthDescriptor(Action<MappingLimitSettingsDepthDescriptor> configure) => configure.Invoke(this);
+
 	public MappingLimitSettingsDepthDescriptor() : base()
 	{
 	}
 
 	private int? LimitValue { get; set; }
 
+	/// <summary>
+	/// <para>The maximum depth for a field, which is measured as the number of inner objects. For instance, if all fields are defined<br/>at the root object level, then the depth is 1. If there is one object mapping, then the depth is 2, etc.</para>
+	/// </summary>
 	public MappingLimitSettingsDepthDescriptor Limit(int? limit)
 	{
 		LimitValue = limit;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsDimensionFields.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsDimensionFields.g.cs
index 5570c014e85..9e8c151bc1a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsDimensionFields.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsDimensionFields.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,10 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class MappingLimitSettingsDimensionFields
 {
+	/// <summary>
+	/// <para>[preview] This functionality is in technical preview and may be changed or removed in a future release. Elastic will<br/>apply best effort to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("limit")]
 	public int? Limit { get; set; }
 }
@@ -34,12 +39,16 @@ public sealed partial class MappingLimitSettingsDimensionFields
 public sealed partial class MappingLimitSettingsDimensionFieldsDescriptor : SerializableDescriptor<MappingLimitSettingsDimensionFieldsDescriptor>
 {
 	internal MappingLimitSettingsDimensionFieldsDescriptor(Action<MappingLimitSettingsDimensionFieldsDescriptor> configure) => configure.Invoke(this);
+
 	public MappingLimitSettingsDimensionFieldsDescriptor() : base()
 	{
 	}
 
 	private int? LimitValue { get; set; }
 
+	/// <summary>
+	/// <para>[preview] This functionality is in technical preview and may be changed or removed in a future release. Elastic will<br/>apply best effort to fix any issues, but features in technical preview are not subject to the support SLA of official GA features.</para>
+	/// </summary>
 	public MappingLimitSettingsDimensionFieldsDescriptor Limit(int? limit)
 	{
 		LimitValue = limit;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsFieldNameLength.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsFieldNameLength.g.cs
index 91abb6c4b97..2e89e4c0046 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsFieldNameLength.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsFieldNameLength.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,10 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class MappingLimitSettingsFieldNameLength
 {
+	/// <summary>
+	/// <para>Setting for the maximum length of a field name. This setting isn’t really something that addresses mappings explosion but<br/>might still be useful if you want to limit the field length. It usually shouldn’t be necessary to set this setting. The<br/>default is okay unless a user starts to add a huge number of fields with really long names. Default is `Long.MAX_VALUE` (no limit).</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("limit")]
 	public long? Limit { get; set; }
 }
@@ -34,12 +39,16 @@ public sealed partial class MappingLimitSettingsFieldNameLength
 public sealed partial class MappingLimitSettingsFieldNameLengthDescriptor : SerializableDescriptor<MappingLimitSettingsFieldNameLengthDescriptor>
 {
 	internal MappingLimitSettingsFieldNameLengthDescriptor(Action<MappingLimitSettingsFieldNameLengthDescriptor> configure) => configure.Invoke(this);
+
 	public MappingLimitSettingsFieldNameLengthDescriptor() : base()
 	{
 	}
 
 	private long? LimitValue { get; set; }
 
+	/// <summary>
+	/// <para>Setting for the maximum length of a field name. This setting isn’t really something that addresses mappings explosion but<br/>might still be useful if you want to limit the field length. It usually shouldn’t be necessary to set this setting. The<br/>default is okay unless a user starts to add a huge number of fields with really long names. Default is `Long.MAX_VALUE` (no limit).</para>
+	/// </summary>
 	public MappingLimitSettingsFieldNameLengthDescriptor Limit(long? limit)
 	{
 		LimitValue = limit;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsNestedFields.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsNestedFields.g.cs
index f883e7be653..ba59c02603a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsNestedFields.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsNestedFields.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,10 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class MappingLimitSettingsNestedFields
 {
+	/// <summary>
+	/// <para>The maximum number of distinct nested mappings in an index. The nested type should only be used in special cases, when<br/>arrays of objects need to be queried independently of each other. To safeguard against poorly designed mappings, this<br/>setting limits the number of unique nested types per index.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("limit")]
 	public int? Limit { get; set; }
 }
@@ -34,12 +39,16 @@ public sealed partial class MappingLimitSettingsNestedFields
 public sealed partial class MappingLimitSettingsNestedFieldsDescriptor : SerializableDescriptor<MappingLimitSettingsNestedFieldsDescriptor>
 {
 	internal MappingLimitSettingsNestedFieldsDescriptor(Action<MappingLimitSettingsNestedFieldsDescriptor> configure) => configure.Invoke(this);
+
 	public MappingLimitSettingsNestedFieldsDescriptor() : base()
 	{
 	}
 
 	private int? LimitValue { get; set; }
 
+	/// <summary>
+	/// <para>The maximum number of distinct nested mappings in an index. The nested type should only be used in special cases, when<br/>arrays of objects need to be queried independently of each other. To safeguard against poorly designed mappings, this<br/>setting limits the number of unique nested types per index.</para>
+	/// </summary>
 	public MappingLimitSettingsNestedFieldsDescriptor Limit(int? limit)
 	{
 		LimitValue = limit;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsNestedObjects.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsNestedObjects.g.cs
index a0fbb6c50e1..1cff770a6bd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsNestedObjects.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsNestedObjects.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,10 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class MappingLimitSettingsNestedObjects
 {
+	/// <summary>
+	/// <para>The maximum number of nested JSON objects that a single document can contain across all nested types. This limit helps<br/>to prevent out of memory errors when a document contains too many nested objects.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("limit")]
 	public int? Limit { get; set; }
 }
@@ -34,12 +39,16 @@ public sealed partial class MappingLimitSettingsNestedObjects
 public sealed partial class MappingLimitSettingsNestedObjectsDescriptor : SerializableDescriptor<MappingLimitSettingsNestedObjectsDescriptor>
 {
 	internal MappingLimitSettingsNestedObjectsDescriptor(Action<MappingLimitSettingsNestedObjectsDescriptor> configure) => configure.Invoke(this);
+
 	public MappingLimitSettingsNestedObjectsDescriptor() : base()
 	{
 	}
 
 	private int? LimitValue { get; set; }
 
+	/// <summary>
+	/// <para>The maximum number of nested JSON objects that a single document can contain across all nested types. This limit helps<br/>to prevent out of memory errors when a document contains too many nested objects.</para>
+	/// </summary>
 	public MappingLimitSettingsNestedObjectsDescriptor Limit(int? limit)
 	{
 		LimitValue = limit;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsTotalFields.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsTotalFields.g.cs
index 56e18c853d7..7d1b7488239 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsTotalFields.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MappingLimitSettingsTotalFields.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,10 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class MappingLimitSettingsTotalFields
 {
+	/// <summary>
+	/// <para>The maximum number of fields in an index. Field and object mappings, as well as field aliases count towards this limit.<br/>The limit is in place to prevent mappings and searches from becoming too large. Higher values can lead to performance<br/>degradations and memory issues, especially in clusters with a high load or few resources.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("limit")]
 	public int? Limit { get; set; }
 }
@@ -34,12 +39,16 @@ public sealed partial class MappingLimitSettingsTotalFields
 public sealed partial class MappingLimitSettingsTotalFieldsDescriptor : SerializableDescriptor<MappingLimitSettingsTotalFieldsDescriptor>
 {
 	internal MappingLimitSettingsTotalFieldsDescriptor(Action<MappingLimitSettingsTotalFieldsDescriptor> configure) => configure.Invoke(this);
+
 	public MappingLimitSettingsTotalFieldsDescriptor() : base()
 	{
 	}
 
 	private int? LimitValue { get; set; }
 
+	/// <summary>
+	/// <para>The maximum number of fields in an index. Field and object mappings, as well as field aliases count towards this limit.<br/>The limit is in place to prevent mappings and searches from becoming too large. Higher values can lead to performance<br/>degradations and memory issues, especially in clusters with a high load or few resources.</para>
+	/// </summary>
 	public MappingLimitSettingsTotalFieldsDescriptor Limit(int? limit)
 	{
 		LimitValue = limit;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Merge.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Merge.g.cs
index 90728ebaba5..bc0ced9904c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Merge.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Merge.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class Merge
 {
 	[JsonInclude, JsonPropertyName("scheduler")]
@@ -34,14 +36,13 @@ public sealed partial class Merge
 public sealed partial class MergeDescriptor : SerializableDescriptor<MergeDescriptor>
 {
 	internal MergeDescriptor(Action<MergeDescriptor> configure) => configure.Invoke(this);
+
 	public MergeDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.MergeScheduler? SchedulerValue { get; set; }
-
 	private MergeSchedulerDescriptor SchedulerDescriptor { get; set; }
-
 	private Action<MergeSchedulerDescriptor> SchedulerDescriptorAction { get; set; }
 
 	public MergeDescriptor Scheduler(Elastic.Clients.Elasticsearch.IndexManagement.MergeScheduler? scheduler)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MergeScheduler.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MergeScheduler.g.cs
index 0fd6612ba32..e933ab90b77 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MergeScheduler.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/MergeScheduler.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class MergeScheduler
 {
 	[JsonInclude, JsonPropertyName("max_merge_count")]
 	public int? MaxMergeCount { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_thread_count")]
 	public int? MaxThreadCount { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class MergeScheduler
 public sealed partial class MergeSchedulerDescriptor : SerializableDescriptor<MergeSchedulerDescriptor>
 {
 	internal MergeSchedulerDescriptor(Action<MergeSchedulerDescriptor> configure) => configure.Invoke(this);
+
 	public MergeSchedulerDescriptor() : base()
 	{
 	}
 
 	private int? MaxMergeCountValue { get; set; }
-
 	private int? MaxThreadCountValue { get; set; }
 
 	public MergeSchedulerDescriptor MaxMergeCount(int? maxMergeCount)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/NumericFielddata.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/NumericFielddata.g.cs
index 3dafeb2c80e..9eebccae1e9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/NumericFielddata.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/NumericFielddata.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class NumericFielddata
 {
 	[JsonInclude, JsonPropertyName("format")]
@@ -34,6 +36,7 @@ public sealed partial class NumericFielddata
 public sealed partial class NumericFielddataDescriptor : SerializableDescriptor<NumericFielddataDescriptor>, IBuildableDescriptor<NumericFielddata>
 {
 	internal NumericFielddataDescriptor(Action<NumericFielddataDescriptor> configure) => configure.Invoke(this);
+
 	public NumericFielddataDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Overlapping.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Overlapping.g.cs
index 8615242d388..d61e05dabff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Overlapping.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Overlapping.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class Overlapping
 {
 	[JsonInclude, JsonPropertyName("index_patterns")]
 	public IReadOnlyCollection<string> IndexPatterns { get; init; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Queries.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Queries.g.cs
index 7eca39c524a..ef70b16cddf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Queries.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Queries.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class Queries
 {
 	[JsonInclude, JsonPropertyName("cache")]
@@ -34,14 +36,13 @@ public sealed partial class Queries
 public sealed partial class QueriesDescriptor : SerializableDescriptor<QueriesDescriptor>
 {
 	internal QueriesDescriptor(Action<QueriesDescriptor> configure) => configure.Invoke(this);
+
 	public QueriesDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.CacheQueries? CacheValue { get; set; }
-
 	private CacheQueriesDescriptor CacheDescriptor { get; set; }
-
 	private Action<CacheQueriesDescriptor> CacheDescriptorAction { get; set; }
 
 	public QueriesDescriptor Cache(Elastic.Clients.Elasticsearch.IndexManagement.CacheQueries? cache)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RemoveAction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RemoveAction.g.cs
index 64ac53f485e..496c5795a5d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RemoveAction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RemoveAction.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class RemoveAction
 {
 	[JsonInclude, JsonPropertyName("alias")]
 	public Elastic.Clients.Elasticsearch.IndexAlias? Alias { get; set; }
-
 	[JsonInclude, JsonPropertyName("aliases"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.IndexAlias))]
 	public ICollection<Elastic.Clients.Elasticsearch.IndexAlias>? Aliases { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Indices? Indices { get; set; }
-
 	[JsonInclude, JsonPropertyName("must_exist")]
 	public bool? MustExist { get; set; }
 
@@ -48,18 +46,15 @@ public sealed partial class RemoveAction
 public sealed partial class RemoveActionDescriptor : SerializableDescriptor<RemoveActionDescriptor>
 {
 	internal RemoveActionDescriptor(Action<RemoveActionDescriptor> configure) => configure.Invoke(this);
+
 	public RemoveActionDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexAlias? AliasValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.IndexAlias>? AliasesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Indices? IndicesValue { get; set; }
-
 	private bool? MustExistValue { get; set; }
 
 	public RemoveActionDescriptor Alias(Elastic.Clients.Elasticsearch.IndexAlias? alias)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RemoveIndexAction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RemoveIndexAction.g.cs
index 71effc73fd3..0e23ad8dac4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RemoveIndexAction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RemoveIndexAction.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class RemoveIndexAction
 {
 	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.Indices? Indices { get; set; }
-
 	[JsonInclude, JsonPropertyName("must_exist")]
 	public bool? MustExist { get; set; }
 
@@ -42,14 +42,13 @@ public sealed partial class RemoveIndexAction
 public sealed partial class RemoveIndexActionDescriptor : SerializableDescriptor<RemoveIndexActionDescriptor>
 {
 	internal RemoveIndexActionDescriptor(Action<RemoveIndexActionDescriptor> configure) => configure.Invoke(this);
+
 	public RemoveIndexActionDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexName? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Indices? IndicesValue { get; set; }
-
 	private bool? MustExistValue { get; set; }
 
 	public RemoveIndexActionDescriptor Index(Elastic.Clients.Elasticsearch.IndexName? index)
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 f66c804b362..7fc4e32ef7e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RetentionLease.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RetentionLease.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class RetentionLease
 {
 	[JsonInclude, JsonPropertyName("period")]
@@ -34,6 +36,7 @@ public sealed partial class RetentionLease
 public sealed partial class RetentionLeaseDescriptor : SerializableDescriptor<RetentionLeaseDescriptor>
 {
 	internal RetentionLeaseDescriptor(Action<RetentionLeaseDescriptor> configure) => configure.Invoke(this);
+
 	public RetentionLeaseDescriptor() : base()
 	{
 	}
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 1a171ab13f7..3e5d2c8e716 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RolloverConditions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/RolloverConditions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,43 +25,32 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class RolloverConditions
 {
 	[JsonInclude, JsonPropertyName("max_age")]
 	public Elastic.Clients.Elasticsearch.Duration? MaxAge { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_age_millis")]
 	public long? MaxAgeMillis { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_docs")]
 	public long? MaxDocs { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_primary_shard_docs")]
 	public long? MaxPrimaryShardDocs { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_primary_shard_size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? MaxPrimaryShardSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? MaxSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_size_bytes")]
 	public Elastic.Clients.Elasticsearch.ByteSize? MaxSizeBytes { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_age")]
 	public Elastic.Clients.Elasticsearch.Duration? MinAge { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_docs")]
 	public long? MinDocs { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_primary_shard_docs")]
 	public long? MinPrimaryShardDocs { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_primary_shard_size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? MinPrimaryShardSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? MinSize { get; set; }
 }
@@ -67,32 +58,22 @@ public sealed partial class RolloverConditions
 public sealed partial class RolloverConditionsDescriptor : SerializableDescriptor<RolloverConditionsDescriptor>
 {
 	internal RolloverConditionsDescriptor(Action<RolloverConditionsDescriptor> configure) => configure.Invoke(this);
+
 	public RolloverConditionsDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Duration? MaxAgeValue { get; set; }
-
 	private long? MaxAgeMillisValue { get; set; }
-
 	private long? MaxDocsValue { get; set; }
-
 	private long? MaxPrimaryShardDocsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.ByteSize? MaxPrimaryShardSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.ByteSize? MaxSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.ByteSize? MaxSizeBytesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? MinAgeValue { get; set; }
-
 	private long? MinDocsValue { get; set; }
-
 	private long? MinPrimaryShardDocsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.ByteSize? MinPrimaryShardSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.ByteSize? MinSizeValue { get; set; }
 
 	public RolloverConditionsDescriptor MaxAge(Elastic.Clients.Elasticsearch.Duration? maxAge)
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 5b00f3078e9..3c8a910aa89 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SearchIdle.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SearchIdle.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SearchIdle
 {
 	[JsonInclude, JsonPropertyName("after")]
@@ -34,6 +36,7 @@ public sealed partial class SearchIdle
 public sealed partial class SearchIdleDescriptor : SerializableDescriptor<SearchIdleDescriptor>
 {
 	internal SearchIdleDescriptor(Action<SearchIdleDescriptor> configure) => configure.Invoke(this);
+
 	public SearchIdleDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsAnalyze.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsAnalyze.g.cs
index 87f5f272d96..c848a55f254 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsAnalyze.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsAnalyze.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsAnalyze
 {
 	[JsonInclude, JsonPropertyName("max_token_count")]
@@ -34,6 +36,7 @@ public sealed partial class SettingsAnalyze
 public sealed partial class SettingsAnalyzeDescriptor : SerializableDescriptor<SettingsAnalyzeDescriptor>
 {
 	internal SettingsAnalyzeDescriptor(Action<SettingsAnalyzeDescriptor> configure) => configure.Invoke(this);
+
 	public SettingsAnalyzeDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsHighlight.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsHighlight.g.cs
index 86bcecdee71..e070b688a5f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsHighlight.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsHighlight.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsHighlight
 {
 	[JsonInclude, JsonPropertyName("max_analyzed_offset")]
@@ -34,6 +36,7 @@ public sealed partial class SettingsHighlight
 public sealed partial class SettingsHighlightDescriptor : SerializableDescriptor<SettingsHighlightDescriptor>
 {
 	internal SettingsHighlightDescriptor(Action<SettingsHighlightDescriptor> configure) => configure.Invoke(this);
+
 	public SettingsHighlightDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsQueryString.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsQueryString.g.cs
index 6b08c5bb5ac..af44bd56911 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsQueryString.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsQueryString.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsQueryString
 {
 	[JsonInclude, JsonPropertyName("lenient")]
@@ -34,6 +36,7 @@ public sealed partial class SettingsQueryString
 public sealed partial class SettingsQueryStringDescriptor : SerializableDescriptor<SettingsQueryStringDescriptor>
 {
 	internal SettingsQueryStringDescriptor(Action<SettingsQueryStringDescriptor> configure) => configure.Invoke(this);
+
 	public SettingsQueryStringDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSearch.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSearch.g.cs
index d16aac7bb96..a9c5ec19506 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSearch.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSearch.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsSearch
 {
 	[JsonInclude, JsonPropertyName("idle")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SearchIdle? Idle { get; set; }
-
 	[JsonInclude, JsonPropertyName("slowlog")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SlowlogSettings? Slowlog { get; set; }
 }
@@ -37,20 +38,16 @@ public sealed partial class SettingsSearch
 public sealed partial class SettingsSearchDescriptor : SerializableDescriptor<SettingsSearchDescriptor>
 {
 	internal SettingsSearchDescriptor(Action<SettingsSearchDescriptor> configure) => configure.Invoke(this);
+
 	public SettingsSearchDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.SearchIdle? IdleValue { get; set; }
-
 	private SearchIdleDescriptor IdleDescriptor { get; set; }
-
 	private Action<SearchIdleDescriptor> IdleDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SlowlogSettings? SlowlogValue { get; set; }
-
 	private SlowlogSettingsDescriptor SlowlogDescriptor { get; set; }
-
 	private Action<SlowlogSettingsDescriptor> SlowlogDescriptorAction { get; set; }
 
 	public SettingsSearchDescriptor Idle(Elastic.Clients.Elasticsearch.IndexManagement.SearchIdle? idle)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarity.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarity.g.cs
index 4a3aa4bdede..00766e3a55c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarity.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarity.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsSimilarity
 {
 	[JsonInclude, JsonPropertyName("bm25")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityBm25? Bm25 { get; set; }
-
 	[JsonInclude, JsonPropertyName("dfi")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfi? Dfi { get; set; }
-
 	[JsonInclude, JsonPropertyName("dfr")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfr? Dfr { get; set; }
-
 	[JsonInclude, JsonPropertyName("ib")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityIb? Ib { get; set; }
-
 	[JsonInclude, JsonPropertyName("lmd")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmd? Lmd { get; set; }
-
 	[JsonInclude, JsonPropertyName("lmj")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmj? Lmj { get; set; }
-
 	[JsonInclude, JsonPropertyName("scripted_tfidf")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityScriptedTfidf? ScriptedTfidf { get; set; }
 }
@@ -52,50 +48,31 @@ public sealed partial class SettingsSimilarity
 public sealed partial class SettingsSimilarityDescriptor : SerializableDescriptor<SettingsSimilarityDescriptor>
 {
 	internal SettingsSimilarityDescriptor(Action<SettingsSimilarityDescriptor> configure) => configure.Invoke(this);
+
 	public SettingsSimilarityDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityBm25? Bm25Value { get; set; }
-
 	private SettingsSimilarityBm25Descriptor Bm25Descriptor { get; set; }
-
 	private Action<SettingsSimilarityBm25Descriptor> Bm25DescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfi? DfiValue { get; set; }
-
 	private SettingsSimilarityDfiDescriptor DfiDescriptor { get; set; }
-
 	private Action<SettingsSimilarityDfiDescriptor> DfiDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityDfr? DfrValue { get; set; }
-
 	private SettingsSimilarityDfrDescriptor DfrDescriptor { get; set; }
-
 	private Action<SettingsSimilarityDfrDescriptor> DfrDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityIb? IbValue { get; set; }
-
 	private SettingsSimilarityIbDescriptor IbDescriptor { get; set; }
-
 	private Action<SettingsSimilarityIbDescriptor> IbDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmd? LmdValue { get; set; }
-
 	private SettingsSimilarityLmdDescriptor LmdDescriptor { get; set; }
-
 	private Action<SettingsSimilarityLmdDescriptor> LmdDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityLmj? LmjValue { get; set; }
-
 	private SettingsSimilarityLmjDescriptor LmjDescriptor { get; set; }
-
 	private Action<SettingsSimilarityLmjDescriptor> LmjDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityScriptedTfidf? ScriptedTfidfValue { get; set; }
-
 	private SettingsSimilarityScriptedTfidfDescriptor ScriptedTfidfDescriptor { get; set; }
-
 	private Action<SettingsSimilarityScriptedTfidfDescriptor> ScriptedTfidfDescriptorAction { get; set; }
 
 	public SettingsSimilarityDescriptor Bm25(Elastic.Clients.Elasticsearch.IndexManagement.SettingsSimilarityBm25? bm25)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityBm25.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityBm25.g.cs
index a9bbd0b2627..1f64cabed29 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityBm25.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityBm25.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,35 +25,31 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsSimilarityBm25
 {
 	[JsonInclude, JsonPropertyName("b")]
 	public double b { get; set; }
-
 	[JsonInclude, JsonPropertyName("discount_overlaps")]
 	public bool DiscountOverlaps { get; set; }
-
 	[JsonInclude, JsonPropertyName("k1")]
 	public double K1 { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "BM25";
 }
 
 public sealed partial class SettingsSimilarityBm25Descriptor : SerializableDescriptor<SettingsSimilarityBm25Descriptor>
 {
 	internal SettingsSimilarityBm25Descriptor(Action<SettingsSimilarityBm25Descriptor> configure) => configure.Invoke(this);
+
 	public SettingsSimilarityBm25Descriptor() : base()
 	{
 	}
 
 	private double bValue { get; set; }
-
 	private bool DiscountOverlapsValue { get; set; }
-
 	private double K1Value { get; set; }
 
 	public SettingsSimilarityBm25Descriptor b(double b)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityDfi.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityDfi.g.cs
index 44188cfc3f8..bf46e170f92 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityDfi.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityDfi.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,21 +25,21 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsSimilarityDfi
 {
 	[JsonInclude, JsonPropertyName("independence_measure")]
 	public Elastic.Clients.Elasticsearch.DFIIndependenceMeasure IndependenceMeasure { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "DFI";
 }
 
 public sealed partial class SettingsSimilarityDfiDescriptor : SerializableDescriptor<SettingsSimilarityDfiDescriptor>
 {
 	internal SettingsSimilarityDfiDescriptor(Action<SettingsSimilarityDfiDescriptor> configure) => configure.Invoke(this);
+
 	public SettingsSimilarityDfiDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityDfr.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityDfr.g.cs
index 9141a4383bd..e60d0306cb0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityDfr.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityDfr.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,35 +25,31 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsSimilarityDfr
 {
 	[JsonInclude, JsonPropertyName("after_effect")]
 	public Elastic.Clients.Elasticsearch.DFRAfterEffect AfterEffect { get; set; }
-
 	[JsonInclude, JsonPropertyName("basic_model")]
 	public Elastic.Clients.Elasticsearch.DFRBasicModel BasicModel { get; set; }
-
 	[JsonInclude, JsonPropertyName("normalization")]
 	public Elastic.Clients.Elasticsearch.Normalization Normalization { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "DFR";
 }
 
 public sealed partial class SettingsSimilarityDfrDescriptor : SerializableDescriptor<SettingsSimilarityDfrDescriptor>
 {
 	internal SettingsSimilarityDfrDescriptor(Action<SettingsSimilarityDfrDescriptor> configure) => configure.Invoke(this);
+
 	public SettingsSimilarityDfrDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.DFRAfterEffect AfterEffectValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DFRBasicModel BasicModelValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Normalization NormalizationValue { get; set; }
 
 	public SettingsSimilarityDfrDescriptor AfterEffect(Elastic.Clients.Elasticsearch.DFRAfterEffect afterEffect)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityIb.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityIb.g.cs
index 68811c821c4..f66cf9b9dd9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityIb.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityIb.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,35 +25,31 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsSimilarityIb
 {
 	[JsonInclude, JsonPropertyName("distribution")]
 	public Elastic.Clients.Elasticsearch.IBDistribution Distribution { get; set; }
-
 	[JsonInclude, JsonPropertyName("lambda")]
 	public Elastic.Clients.Elasticsearch.IBLambda Lambda { get; set; }
-
 	[JsonInclude, JsonPropertyName("normalization")]
 	public Elastic.Clients.Elasticsearch.Normalization Normalization { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "IB";
 }
 
 public sealed partial class SettingsSimilarityIbDescriptor : SerializableDescriptor<SettingsSimilarityIbDescriptor>
 {
 	internal SettingsSimilarityIbDescriptor(Action<SettingsSimilarityIbDescriptor> configure) => configure.Invoke(this);
+
 	public SettingsSimilarityIbDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IBDistribution DistributionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IBLambda LambdaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Normalization NormalizationValue { get; set; }
 
 	public SettingsSimilarityIbDescriptor Distribution(Elastic.Clients.Elasticsearch.IBDistribution distribution)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityLmd.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityLmd.g.cs
index e09d98f4c57..0e6c3c3faee 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityLmd.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityLmd.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,21 +25,21 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsSimilarityLmd
 {
 	[JsonInclude, JsonPropertyName("mu")]
 	public int Mu { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "LMDirichlet";
 }
 
 public sealed partial class SettingsSimilarityLmdDescriptor : SerializableDescriptor<SettingsSimilarityLmdDescriptor>
 {
 	internal SettingsSimilarityLmdDescriptor(Action<SettingsSimilarityLmdDescriptor> configure) => configure.Invoke(this);
+
 	public SettingsSimilarityLmdDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityLmj.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityLmj.g.cs
index 3b815058c9f..f96c1f51658 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityLmj.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityLmj.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,21 +25,21 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsSimilarityLmj
 {
 	[JsonInclude, JsonPropertyName("lambda")]
 	public double Lambda { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "LMJelinekMercer";
 }
 
 public sealed partial class SettingsSimilarityLmjDescriptor : SerializableDescriptor<SettingsSimilarityLmjDescriptor>
 {
 	internal SettingsSimilarityLmjDescriptor(Action<SettingsSimilarityLmjDescriptor> configure) => configure.Invoke(this);
+
 	public SettingsSimilarityLmjDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityScriptedTfidf.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityScriptedTfidf.g.cs
index 2f0a166f752..ca7b01dad08 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityScriptedTfidf.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SettingsSimilarityScriptedTfidf.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,21 +25,21 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SettingsSimilarityScriptedTfidf
 {
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script Script { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "scripted";
 }
 
 public sealed partial class SettingsSimilarityScriptedTfidfDescriptor : SerializableDescriptor<SettingsSimilarityScriptedTfidfDescriptor>
 {
 	internal SettingsSimilarityScriptedTfidfDescriptor(Action<SettingsSimilarityScriptedTfidfDescriptor> configure) => configure.Invoke(this);
+
 	public SettingsSimilarityScriptedTfidfDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardCommit.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardCommit.g.cs
index f92e1a3c15d..8d09ad5f3c9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardCommit.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardCommit.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ShardCommit
 {
 	[JsonInclude, JsonPropertyName("generation")]
 	public int Generation { get; init; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("num_docs")]
 	public long NumDocs { get; init; }
-
 	[JsonInclude, JsonPropertyName("user_data")]
 	public IReadOnlyDictionary<string, string> UserData { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardFileSizeInfo.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardFileSizeInfo.g.cs
index c2159277100..430290e4f24 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardFileSizeInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardFileSizeInfo.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ShardFileSizeInfo
 {
 	[JsonInclude, JsonPropertyName("average_size_in_bytes")]
 	public long? AverageSizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("count")]
 	public long? Count { get; init; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string Description { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_size_in_bytes")]
 	public long? MaxSizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("min_size_in_bytes")]
 	public long? MinSizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("size_in_bytes")]
 	public long SizeInBytes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardLease.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardLease.g.cs
index f43293ef513..35f6bbf2607 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardLease.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardLease.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ShardLease
 {
 	[JsonInclude, JsonPropertyName("id")]
 	public string Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("retaining_seq_no")]
 	public long RetainingSeqNo { get; init; }
-
 	[JsonInclude, JsonPropertyName("source")]
 	public string Source { get; init; }
-
 	[JsonInclude, JsonPropertyName("timestamp")]
 	public long Timestamp { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardPath.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardPath.g.cs
index c996f0fe251..2155b760511 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardPath.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardPath.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ShardPath
 {
 	[JsonInclude, JsonPropertyName("data_path")]
 	public string DataPath { get; init; }
-
 	[JsonInclude, JsonPropertyName("is_custom_data_path")]
 	public bool IsCustomDataPath { get; init; }
-
 	[JsonInclude, JsonPropertyName("state_path")]
 	public string StatePath { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardQueryCache.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardQueryCache.g.cs
index 65808550aa9..a10cd7c8280 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardQueryCache.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardQueryCache.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ShardQueryCache
 {
 	[JsonInclude, JsonPropertyName("cache_count")]
 	public long CacheCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("cache_size")]
 	public long CacheSize { get; init; }
-
 	[JsonInclude, JsonPropertyName("evictions")]
 	public long Evictions { get; init; }
-
 	[JsonInclude, JsonPropertyName("hit_count")]
 	public long HitCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("memory_size_in_bytes")]
 	public long MemorySizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("miss_count")]
 	public long MissCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_count")]
 	public long TotalCount { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardRetentionLeases.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardRetentionLeases.g.cs
index ee30389b0e1..3ee107b7d2c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardRetentionLeases.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardRetentionLeases.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ShardRetentionLeases
 {
 	[JsonInclude, JsonPropertyName("leases")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.IndexManagement.ShardLease> Leases { get; init; }
-
 	[JsonInclude, JsonPropertyName("primary_term")]
 	public long PrimaryTerm { 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/IndexManagement/ShardRouting.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardRouting.g.cs
index 8deed2a7af2..98939e39a15 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardRouting.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardRouting.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ShardRouting
 {
 	[JsonInclude, JsonPropertyName("node")]
 	public string Node { get; init; }
-
 	[JsonInclude, JsonPropertyName("primary")]
 	public bool Primary { get; init; }
-
 	[JsonInclude, JsonPropertyName("relocating_node")]
 	public string? RelocatingNode { get; init; }
-
 	[JsonInclude, JsonPropertyName("state")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardRoutingState State { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardSequenceNumber.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardSequenceNumber.g.cs
index 0563fd14625..7d571c4d163 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardSequenceNumber.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardSequenceNumber.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ShardSequenceNumber
 {
 	[JsonInclude, JsonPropertyName("global_checkpoint")]
 	public long GlobalCheckpoint { get; init; }
-
 	[JsonInclude, JsonPropertyName("local_checkpoint")]
 	public long LocalCheckpoint { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_seq_no")]
 	public long MaxSeqNo { get; init; }
 }
\ No newline at end of file
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 ebc16672a79..b070da02514 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,79 +25,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ShardStats
 {
 	[JsonInclude, JsonPropertyName("bulk")]
 	public Elastic.Clients.Elasticsearch.BulkStats? Bulk { get; init; }
-
 	[JsonInclude, JsonPropertyName("commit")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardCommit? Commit { get; init; }
-
 	[JsonInclude, JsonPropertyName("completion")]
 	public Elastic.Clients.Elasticsearch.CompletionStats? Completion { get; init; }
-
 	[JsonInclude, JsonPropertyName("docs")]
 	public Elastic.Clients.Elasticsearch.DocStats? Docs { get; init; }
-
 	[JsonInclude, JsonPropertyName("fielddata")]
 	public Elastic.Clients.Elasticsearch.FielddataStats? Fielddata { get; init; }
-
 	[JsonInclude, JsonPropertyName("flush")]
 	public Elastic.Clients.Elasticsearch.FlushStats? Flush { get; init; }
-
 	[JsonInclude, JsonPropertyName("get")]
 	public Elastic.Clients.Elasticsearch.GetStats? Get { get; init; }
-
 	[JsonInclude, JsonPropertyName("indexing")]
 	public Elastic.Clients.Elasticsearch.IndexingStats? Indexing { get; init; }
-
 	[JsonInclude, JsonPropertyName("indices")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndicesStats? Indices { get; init; }
-
 	[JsonInclude, JsonPropertyName("merges")]
 	public Elastic.Clients.Elasticsearch.MergesStats? Merges { get; init; }
-
 	[JsonInclude, JsonPropertyName("query_cache")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardQueryCache? QueryCache { get; init; }
-
 	[JsonInclude, JsonPropertyName("recovery")]
 	public Elastic.Clients.Elasticsearch.RecoveryStats? Recovery { get; init; }
-
 	[JsonInclude, JsonPropertyName("refresh")]
 	public Elastic.Clients.Elasticsearch.RefreshStats? Refresh { get; init; }
-
 	[JsonInclude, JsonPropertyName("request_cache")]
 	public Elastic.Clients.Elasticsearch.RequestCacheStats? RequestCache { get; init; }
-
 	[JsonInclude, JsonPropertyName("retention_leases")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardRetentionLeases? RetentionLeases { get; init; }
-
 	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardRouting? Routing { get; init; }
-
 	[JsonInclude, JsonPropertyName("search")]
 	public Elastic.Clients.Elasticsearch.SearchStats? Search { get; init; }
-
 	[JsonInclude, JsonPropertyName("segments")]
 	public Elastic.Clients.Elasticsearch.SegmentsStats? Segments { get; init; }
-
 	[JsonInclude, JsonPropertyName("seq_no")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardSequenceNumber? SeqNo { get; init; }
-
 	[JsonInclude, JsonPropertyName("shard_path")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardPath? ShardPath { get; init; }
-
 	[JsonInclude, JsonPropertyName("shards")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardsTotalStats? Shards { get; init; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public Elastic.Clients.Elasticsearch.StoreStats? Store { get; init; }
-
 	[JsonInclude, JsonPropertyName("translog")]
 	public Elastic.Clients.Elasticsearch.TranslogStats? Translog { get; init; }
-
 	[JsonInclude, JsonPropertyName("warmer")]
 	public Elastic.Clients.Elasticsearch.WarmerStats? Warmer { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardsTotalStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardsTotalStats.g.cs
index 9626fbea811..bf947d8f11b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardsTotalStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/ShardsTotalStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class ShardsTotalStats
 {
 	[JsonInclude, JsonPropertyName("total_count")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogSettings.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogSettings.g.cs
index ff02113925e..e049c5ed73f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogSettings.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogSettings.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SlowlogSettings
 {
 	[JsonInclude, JsonPropertyName("level")]
 	public string? Level { get; set; }
-
 	[JsonInclude, JsonPropertyName("reformat")]
 	public bool? Reformat { get; set; }
-
 	[JsonInclude, JsonPropertyName("source")]
 	public int? Source { get; set; }
-
 	[JsonInclude, JsonPropertyName("threshold")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SlowlogTresholds? Threshold { get; set; }
 }
@@ -43,20 +42,16 @@ public sealed partial class SlowlogSettings
 public sealed partial class SlowlogSettingsDescriptor : SerializableDescriptor<SlowlogSettingsDescriptor>
 {
 	internal SlowlogSettingsDescriptor(Action<SlowlogSettingsDescriptor> configure) => configure.Invoke(this);
+
 	public SlowlogSettingsDescriptor() : base()
 	{
 	}
 
 	private string? LevelValue { get; set; }
-
 	private bool? ReformatValue { get; set; }
-
 	private int? SourceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SlowlogTresholds? ThresholdValue { get; set; }
-
 	private SlowlogTresholdsDescriptor ThresholdDescriptor { get; set; }
-
 	private Action<SlowlogTresholdsDescriptor> ThresholdDescriptorAction { get; set; }
 
 	public SlowlogSettingsDescriptor Level(string? level)
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 0f3b4af90b6..366828d9fa2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogTresholdLevels.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogTresholdLevels.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SlowlogTresholdLevels
 {
 	[JsonInclude, JsonPropertyName("debug")]
 	public Elastic.Clients.Elasticsearch.Duration? Debug { get; set; }
-
 	[JsonInclude, JsonPropertyName("info")]
 	public Elastic.Clients.Elasticsearch.Duration? Info { get; set; }
-
 	[JsonInclude, JsonPropertyName("trace")]
 	public Elastic.Clients.Elasticsearch.Duration? Trace { get; set; }
-
 	[JsonInclude, JsonPropertyName("warn")]
 	public Elastic.Clients.Elasticsearch.Duration? Warn { get; set; }
 }
@@ -43,16 +42,14 @@ public sealed partial class SlowlogTresholdLevels
 public sealed partial class SlowlogTresholdLevelsDescriptor : SerializableDescriptor<SlowlogTresholdLevelsDescriptor>
 {
 	internal SlowlogTresholdLevelsDescriptor(Action<SlowlogTresholdLevelsDescriptor> configure) => configure.Invoke(this);
+
 	public SlowlogTresholdLevelsDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Duration? DebugValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? InfoValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? TraceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? WarnValue { get; set; }
 
 	public SlowlogTresholdLevelsDescriptor Debug(Elastic.Clients.Elasticsearch.Duration? debug)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogTresholds.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogTresholds.g.cs
index 4f0f5c0175d..180122bcdcc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogTresholds.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SlowlogTresholds.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SlowlogTresholds
 {
 	[JsonInclude, JsonPropertyName("fetch")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SlowlogTresholdLevels? Fetch { get; set; }
 
+	/// <summary>
+	/// <para>The indexing slow log, similar in functionality to the search slow log. The log file name ends with `_index_indexing_slowlog.json`.<br/>Log and the thresholds are configured in the same way as the search slowlog.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SlowlogTresholdLevels? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.SlowlogTresholdLevels? Query { get; set; }
 }
@@ -40,26 +44,19 @@ public sealed partial class SlowlogTresholds
 public sealed partial class SlowlogTresholdsDescriptor : SerializableDescriptor<SlowlogTresholdsDescriptor>
 {
 	internal SlowlogTresholdsDescriptor(Action<SlowlogTresholdsDescriptor> configure) => configure.Invoke(this);
+
 	public SlowlogTresholdsDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.SlowlogTresholdLevels? FetchValue { get; set; }
-
 	private SlowlogTresholdLevelsDescriptor FetchDescriptor { get; set; }
-
 	private Action<SlowlogTresholdLevelsDescriptor> FetchDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SlowlogTresholdLevels? IndexValue { get; set; }
-
 	private SlowlogTresholdLevelsDescriptor IndexDescriptor { get; set; }
-
 	private Action<SlowlogTresholdLevelsDescriptor> IndexDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.SlowlogTresholdLevels? QueryValue { get; set; }
-
 	private SlowlogTresholdLevelsDescriptor QueryDescriptor { get; set; }
-
 	private Action<SlowlogTresholdLevelsDescriptor> QueryDescriptorAction { get; set; }
 
 	public SlowlogTresholdsDescriptor Fetch(Elastic.Clients.Elasticsearch.IndexManagement.SlowlogTresholdLevels? fetch)
@@ -86,6 +83,9 @@ public SlowlogTresholdsDescriptor Fetch(Action<SlowlogTresholdLevelsDescriptor>
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The indexing slow log, similar in functionality to the search slow log. The log file name ends with `_index_indexing_slowlog.json`.<br/>Log and the thresholds are configured in the same way as the search slowlog.</para>
+	/// </summary>
 	public SlowlogTresholdsDescriptor Index(Elastic.Clients.Elasticsearch.IndexManagement.SlowlogTresholdLevels? index)
 	{
 		IndexDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SoftDeletes.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SoftDeletes.g.cs
index e0ff6a0fcbd..ab17074cacd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SoftDeletes.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/SoftDeletes.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class SoftDeletes
 {
+	/// <summary>
+	/// <para>Indicates whether soft deletes are enabled on the index.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("enabled")]
 	public bool? Enabled { get; set; }
 
+	/// <summary>
+	/// <para>The maximum period to retain a shard history retention lease before it is considered expired.<br/>Shard history retention leases ensure that soft deletes are retained during merges on the Lucene<br/>index. If a soft delete is merged away before it can be replicated to a follower the following<br/>process will fail due to incomplete history on the leader.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("retention_lease")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.RetentionLease? RetentionLease { get; set; }
 }
@@ -37,24 +45,28 @@ public sealed partial class SoftDeletes
 public sealed partial class SoftDeletesDescriptor : SerializableDescriptor<SoftDeletesDescriptor>
 {
 	internal SoftDeletesDescriptor(Action<SoftDeletesDescriptor> configure) => configure.Invoke(this);
+
 	public SoftDeletesDescriptor() : base()
 	{
 	}
 
 	private bool? EnabledValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.RetentionLease? RetentionLeaseValue { get; set; }
-
 	private RetentionLeaseDescriptor RetentionLeaseDescriptor { get; set; }
-
 	private Action<RetentionLeaseDescriptor> RetentionLeaseDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>Indicates whether soft deletes are enabled on the index.</para>
+	/// </summary>
 	public SoftDeletesDescriptor Enabled(bool? enabled = true)
 	{
 		EnabledValue = enabled;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The maximum period to retain a shard history retention lease before it is considered expired.<br/>Shard history retention leases ensure that soft deletes are retained during merges on the Lucene<br/>index. If a soft delete is merged away before it can be replicated to a follower the following<br/>process will fail due to incomplete history on the leader.</para>
+	/// </summary>
 	public SoftDeletesDescriptor RetentionLease(Elastic.Clients.Elasticsearch.IndexManagement.RetentionLease? retentionLease)
 	{
 		RetentionLeaseDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Storage.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Storage.g.cs
index 4a4f9c7c491..e7ff302bc37 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Storage.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Storage.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,15 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class Storage
 {
+	/// <summary>
+	/// <para>You can restrict the use of the mmapfs and the related hybridfs store type via the setting node.store.allow_mmap.<br/>This is a boolean setting indicating whether or not memory-mapping is allowed. The default is to allow it. This<br/>setting is useful, for example, if you are in an environment where you can not control the ability to create a lot<br/>of memory maps so you need disable the ability to use memory-mapping.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("allow_mmap")]
 	public bool? AllowMmap { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.StorageType Type { get; set; }
 }
@@ -37,14 +41,17 @@ public sealed partial class Storage
 public sealed partial class StorageDescriptor : SerializableDescriptor<StorageDescriptor>
 {
 	internal StorageDescriptor(Action<StorageDescriptor> configure) => configure.Invoke(this);
+
 	public StorageDescriptor() : base()
 	{
 	}
 
 	private bool? AllowMmapValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.StorageType TypeValue { get; set; }
 
+	/// <summary>
+	/// <para>You can restrict the use of the mmapfs and the related hybridfs store type via the setting node.store.allow_mmap.<br/>This is a boolean setting indicating whether or not memory-mapping is allowed. The default is to allow it. This<br/>setting is useful, for example, if you are in an environment where you can not control the ability to create a lot<br/>of memory maps so you need disable the ability to use memory-mapping.</para>
+	/// </summary>
 	public StorageDescriptor AllowMmap(bool? allowMmap = true)
 	{
 		AllowMmapValue = allowMmap;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Template.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Template.g.cs
index 0014d225ab2..fbbf7a1f103 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Template.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Template.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,17 +25,15 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class Template
 {
 	[JsonInclude, JsonPropertyName("aliases")]
 	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.IndexManagement.Alias))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias> Aliases { get; init; }
-
 	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping Mappings { get; init; }
-
 	[JsonInclude, JsonPropertyName("settings")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.IndexSettings Settings { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TemplateMapping.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TemplateMapping.g.cs
index b08810e1474..3d527c7f3f3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TemplateMapping.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TemplateMapping.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,26 +25,21 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class TemplateMapping
 {
 	[JsonInclude, JsonPropertyName("aliases")]
 	[ReadOnlyIndexNameDictionaryConverter(typeof(Elastic.Clients.Elasticsearch.IndexManagement.Alias))]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.IndexName, Elastic.Clients.Elasticsearch.IndexManagement.Alias> Aliases { get; init; }
-
 	[JsonInclude, JsonPropertyName("index_patterns")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Name> IndexPatterns { get; init; }
-
 	[JsonInclude, JsonPropertyName("mappings")]
 	public Elastic.Clients.Elasticsearch.Mapping.TypeMapping Mappings { get; init; }
-
 	[JsonInclude, JsonPropertyName("order")]
 	public int Order { get; init; }
-
 	[JsonInclude, JsonPropertyName("settings")]
 	public IReadOnlyDictionary<string, object> 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/IndexManagement/Translog.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Translog.g.cs
index 1ca2c41f209..114c8e6d065 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Translog.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/Translog.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,27 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class Translog
 {
+	/// <summary>
+	/// <para>Whether or not to `fsync` and commit the translog after every index, delete, update, or bulk request.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("durability")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.TranslogDurability? Durability { get; set; }
 
+	/// <summary>
+	/// <para>The translog stores all operations that are not yet safely persisted in Lucene (i.e., are not<br/>part of a Lucene commit point). Although these operations are available for reads, they will need<br/>to be replayed if the shard was stopped and had to be recovered. This setting controls the<br/>maximum total size of these operations, to prevent recoveries from taking too long. Once the<br/>maximum size has been reached a flush will happen, generating a new Lucene commit point.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("flush_threshold_size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? FlushThresholdSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("retention")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.TranslogRetention? Retention { get; set; }
 
+	/// <summary>
+	/// <para>How often the translog is fsynced to disk and committed, regardless of write operations.<br/>Values less than 100ms are not allowed.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("sync_interval")]
 	public Elastic.Clients.Elasticsearch.Duration? SyncInterval { get; set; }
 }
@@ -43,28 +53,30 @@ public sealed partial class Translog
 public sealed partial class TranslogDescriptor : SerializableDescriptor<TranslogDescriptor>
 {
 	internal TranslogDescriptor(Action<TranslogDescriptor> configure) => configure.Invoke(this);
+
 	public TranslogDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.IndexManagement.TranslogDurability? DurabilityValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.ByteSize? FlushThresholdSizeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.TranslogRetention? RetentionValue { get; set; }
-
 	private TranslogRetentionDescriptor RetentionDescriptor { get; set; }
-
 	private Action<TranslogRetentionDescriptor> RetentionDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Duration? SyncIntervalValue { get; set; }
 
+	/// <summary>
+	/// <para>Whether or not to `fsync` and commit the translog after every index, delete, update, or bulk request.</para>
+	/// </summary>
 	public TranslogDescriptor Durability(Elastic.Clients.Elasticsearch.IndexManagement.TranslogDurability? durability)
 	{
 		DurabilityValue = durability;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The translog stores all operations that are not yet safely persisted in Lucene (i.e., are not<br/>part of a Lucene commit point). Although these operations are available for reads, they will need<br/>to be replayed if the shard was stopped and had to be recovered. This setting controls the<br/>maximum total size of these operations, to prevent recoveries from taking too long. Once the<br/>maximum size has been reached a flush will happen, generating a new Lucene commit point.</para>
+	/// </summary>
 	public TranslogDescriptor FlushThresholdSize(Elastic.Clients.Elasticsearch.ByteSize? flushThresholdSize)
 	{
 		FlushThresholdSizeValue = flushThresholdSize;
@@ -95,6 +107,9 @@ public TranslogDescriptor Retention(Action<TranslogRetentionDescriptor> configur
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>How often the translog is fsynced to disk and committed, regardless of write operations.<br/>Values less than 100ms are not allowed.</para>
+	/// </summary>
 	public TranslogDescriptor SyncInterval(Elastic.Clients.Elasticsearch.Duration? syncInterval)
 	{
 		SyncIntervalValue = syncInterval;
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 3d881fd13b6..b86b56ec6f9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TranslogRetention.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TranslogRetention.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class TranslogRetention
 {
+	/// <summary>
+	/// <para>This controls the maximum duration for which translog files are kept by each shard. Keeping more<br/>translog files increases the chance of performing an operation based sync when recovering replicas. If<br/>the translog files are not sufficient, replica recovery will fall back to a file based sync. This setting<br/>is ignored, and should not be set, if soft deletes are enabled. Soft deletes are enabled by default in<br/>indices created in Elasticsearch versions 7.0.0 and later.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("age")]
 	public Elastic.Clients.Elasticsearch.Duration? Age { get; set; }
 
+	/// <summary>
+	/// <para>This controls the total size of translog files to keep for each shard. Keeping more translog files increases<br/>the chance of performing an operation based sync when recovering a replica. If the translog files are not<br/>sufficient, replica recovery will fall back to a file based sync. This setting is ignored, and should not be<br/>set, if soft deletes are enabled. Soft deletes are enabled by default in indices created in Elasticsearch<br/>versions 7.0.0 and later.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? Size { get; set; }
 }
@@ -37,20 +45,26 @@ public sealed partial class TranslogRetention
 public sealed partial class TranslogRetentionDescriptor : SerializableDescriptor<TranslogRetentionDescriptor>
 {
 	internal TranslogRetentionDescriptor(Action<TranslogRetentionDescriptor> configure) => configure.Invoke(this);
+
 	public TranslogRetentionDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Duration? AgeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.ByteSize? SizeValue { get; set; }
 
+	/// <summary>
+	/// <para>This controls the maximum duration for which translog files are kept by each shard. Keeping more<br/>translog files increases the chance of performing an operation based sync when recovering replicas. If<br/>the translog files are not sufficient, replica recovery will fall back to a file based sync. This setting<br/>is ignored, and should not be set, if soft deletes are enabled. Soft deletes are enabled by default in<br/>indices created in Elasticsearch versions 7.0.0 and later.</para>
+	/// </summary>
 	public TranslogRetentionDescriptor Age(Elastic.Clients.Elasticsearch.Duration? age)
 	{
 		AgeValue = age;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>This controls the total size of translog files to keep for each shard. Keeping more translog files increases<br/>the chance of performing an operation based sync when recovering a replica. If the translog files are not<br/>sufficient, replica recovery will fall back to a file based sync. This setting is ignored, and should not be<br/>set, if soft deletes are enabled. Soft deletes are enabled by default in indices created in Elasticsearch<br/>versions 7.0.0 and later.</para>
+	/// </summary>
 	public TranslogRetentionDescriptor Size(Elastic.Clients.Elasticsearch.ByteSize? size)
 	{
 		SizeValue = size;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TypeFieldMappings.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TypeFieldMappings.g.cs
index 456e292dbe6..c21918185ba 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TypeFieldMappings.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexManagement/TypeFieldMappings.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
+
 public sealed partial class TypeFieldMappings
 {
 	[JsonInclude, JsonPropertyName("mappings")]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexingStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexingStats.g.cs
index d59484db96b..5771c76dcda 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexingStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/IndexingStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,49 +25,36 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class IndexingStats
 {
 	[JsonInclude, JsonPropertyName("delete_current")]
 	public long DeleteCurrent { get; init; }
-
 	[JsonInclude, JsonPropertyName("delete_time")]
 	public Elastic.Clients.Elasticsearch.Duration? DeleteTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("delete_time_in_millis")]
 	public long DeleteTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("delete_total")]
 	public long DeleteTotal { get; init; }
-
 	[JsonInclude, JsonPropertyName("index_current")]
 	public long IndexCurrent { get; init; }
-
 	[JsonInclude, JsonPropertyName("index_failed")]
 	public long IndexFailed { get; init; }
-
 	[JsonInclude, JsonPropertyName("index_time")]
 	public Elastic.Clients.Elasticsearch.Duration? IndexTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("index_time_in_millis")]
 	public long IndexTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("index_total")]
 	public long IndexTotal { get; init; }
-
 	[JsonInclude, JsonPropertyName("is_throttled")]
 	public bool IsThrottled { get; init; }
-
 	[JsonInclude, JsonPropertyName("noop_update_total")]
 	public long NoopUpdateTotal { get; init; }
-
 	[JsonInclude, JsonPropertyName("throttle_time")]
 	public Elastic.Clients.Elasticsearch.Duration? ThrottleTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("throttle_time_in_millis")]
 	public long ThrottleTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("types")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.IndexingStats>? Types { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/AppendProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/AppendProcessor.g.cs
index 7dce2827ce4..1da1c8b49f4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/AppendProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/AppendProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class AppendProcessor
 {
 	[JsonInclude, JsonPropertyName("allow_duplicates")]
 	public bool? AllowDuplicates { get; set; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public ICollection<object> Value { get; set; }
 
@@ -57,30 +52,21 @@ public sealed partial class AppendProcessor
 public sealed partial class AppendProcessorDescriptor<TDocument> : SerializableDescriptor<AppendProcessorDescriptor<TDocument>>
 {
 	internal AppendProcessorDescriptor(Action<AppendProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public AppendProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private bool? AllowDuplicatesValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private ICollection<object> ValueValue { get; set; }
 
 	public AppendProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -242,30 +228,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class AppendProcessorDescriptor : SerializableDescriptor<AppendProcessorDescriptor>
 {
 	internal AppendProcessorDescriptor(Action<AppendProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public AppendProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private bool? AllowDuplicatesValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private ICollection<object> ValueValue { get; set; }
 
 	public AppendProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/AttachmentProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/AttachmentProcessor.g.cs
index 6b5ee372abf..53d2844d66e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/AttachmentProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/AttachmentProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,43 +25,32 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class AttachmentProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("indexed_chars")]
 	public long? IndexedChars { get; set; }
-
 	[JsonInclude, JsonPropertyName("indexed_chars_field")]
 	public Elastic.Clients.Elasticsearch.Field? IndexedCharsField { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public ICollection<string>? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("resource_name")]
 	public string? ResourceName { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -69,38 +60,25 @@ public sealed partial class AttachmentProcessor
 public sealed partial class AttachmentProcessorDescriptor<TDocument> : SerializableDescriptor<AttachmentProcessorDescriptor<TDocument>>
 {
 	internal AttachmentProcessorDescriptor(Action<AttachmentProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public AttachmentProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private long? IndexedCharsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? IndexedCharsFieldValue { get; set; }
-
 	private ICollection<string>? PropertiesValue { get; set; }
-
 	private string? ResourceNameValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public AttachmentProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -326,38 +304,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class AttachmentProcessorDescriptor : SerializableDescriptor<AttachmentProcessorDescriptor>
 {
 	internal AttachmentProcessorDescriptor(Action<AttachmentProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public AttachmentProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private long? IndexedCharsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? IndexedCharsFieldValue { get; set; }
-
 	private ICollection<string>? PropertiesValue { get; set; }
-
 	private string? ResourceNameValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public AttachmentProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/BytesProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/BytesProcessor.g.cs
index f457f6f623e..4d5cdae8f05 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/BytesProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/BytesProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class BytesProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -57,30 +52,21 @@ public sealed partial class BytesProcessor
 public sealed partial class BytesProcessorDescriptor<TDocument> : SerializableDescriptor<BytesProcessorDescriptor<TDocument>>
 {
 	internal BytesProcessorDescriptor(Action<BytesProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public BytesProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public BytesProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -252,30 +238,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class BytesProcessorDescriptor : SerializableDescriptor<BytesProcessorDescriptor>
 {
 	internal BytesProcessorDescriptor(Action<BytesProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public BytesProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public BytesProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/CircleProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/CircleProcessor.g.cs
index 643d0049857..9804fce8410 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/CircleProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/CircleProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class CircleProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("error_distance")]
 	public double ErrorDistance { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("shape_type")]
 	public Elastic.Clients.Elasticsearch.Ingest.ShapeType ShapeType { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -63,34 +56,23 @@ public sealed partial class CircleProcessor
 public sealed partial class CircleProcessorDescriptor<TDocument> : SerializableDescriptor<CircleProcessorDescriptor<TDocument>>
 {
 	internal CircleProcessorDescriptor(Action<CircleProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CircleProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private double ErrorDistanceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ingest.ShapeType ShapeTypeValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public CircleProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -278,34 +260,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class CircleProcessorDescriptor : SerializableDescriptor<CircleProcessorDescriptor>
 {
 	internal CircleProcessorDescriptor(Action<CircleProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public CircleProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private double ErrorDistanceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ingest.ShapeType ShapeTypeValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public CircleProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/ConvertProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/ConvertProcessor.g.cs
index 5d6d69374ea..596f124672b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/ConvertProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/ConvertProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class ConvertProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.Ingest.ConvertType Type { get; set; }
 
@@ -60,32 +54,22 @@ public sealed partial class ConvertProcessor
 public sealed partial class ConvertProcessorDescriptor<TDocument> : SerializableDescriptor<ConvertProcessorDescriptor<TDocument>>
 {
 	internal ConvertProcessorDescriptor(Action<ConvertProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ConvertProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ingest.ConvertType TypeValue { get; set; }
 
 	public ConvertProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -265,32 +249,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ConvertProcessorDescriptor : SerializableDescriptor<ConvertProcessorDescriptor>
 {
 	internal ConvertProcessorDescriptor(Action<ConvertProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public ConvertProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ingest.ConvertType TypeValue { get; set; }
 
 	public ConvertProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/CsvProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/CsvProcessor.g.cs
index 0746d9ce4c9..03198cc9a2c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/CsvProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/CsvProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,43 +25,32 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class CsvProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("empty_value")]
 	public object? EmptyValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("quote")]
 	public string? Quote { get; set; }
-
 	[JsonInclude, JsonPropertyName("separator")]
 	public string? Separator { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_fields")]
 	public Elastic.Clients.Elasticsearch.Fields TargetFields { get; set; }
-
 	[JsonInclude, JsonPropertyName("trim")]
 	public bool? Trim { get; set; }
 
@@ -69,38 +60,25 @@ public sealed partial class CsvProcessor
 public sealed partial class CsvProcessorDescriptor<TDocument> : SerializableDescriptor<CsvProcessorDescriptor<TDocument>>
 {
 	internal CsvProcessorDescriptor(Action<CsvProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CsvProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private object? EmptyValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? QuoteValue { get; set; }
-
 	private string? SeparatorValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields TargetFieldsValue { get; set; }
-
 	private bool? TrimValue { get; set; }
 
 	public CsvProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -310,38 +288,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class CsvProcessorDescriptor : SerializableDescriptor<CsvProcessorDescriptor>
 {
 	internal CsvProcessorDescriptor(Action<CsvProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public CsvProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private object? EmptyValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? QuoteValue { get; set; }
-
 	private string? SeparatorValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields TargetFieldsValue { get; set; }
-
 	private bool? TrimValue { get; set; }
 
 	public CsvProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DateIndexNameProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DateIndexNameProcessor.g.cs
index 646474be71e..608be84a75c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DateIndexNameProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DateIndexNameProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,43 +25,36 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class DateIndexNameProcessor
 {
 	[JsonInclude, JsonPropertyName("date_formats")]
 	public ICollection<string> DateFormats { get; set; }
 
+	/// <summary>
+	/// <para>How to round the date when formatting the date into the index name. Valid values are:<br/>`y` (year), `M` (month), `w` (week), `d` (day), `h` (hour), `m` (minute) and `s` (second).<br/>Supports template snippets.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("date_rounding")]
 	public string DateRounding { get; set; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_name_format")]
 	public string? IndexNameFormat { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_name_prefix")]
 	public string? IndexNamePrefix { get; set; }
-
 	[JsonInclude, JsonPropertyName("locale")]
 	public string? Locale { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("timezone")]
 	public string? Timezone { get; set; }
 
@@ -69,38 +64,25 @@ public sealed partial class DateIndexNameProcessor
 public sealed partial class DateIndexNameProcessorDescriptor<TDocument> : SerializableDescriptor<DateIndexNameProcessorDescriptor<TDocument>>
 {
 	internal DateIndexNameProcessorDescriptor(Action<DateIndexNameProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DateIndexNameProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private ICollection<string> DateFormatsValue { get; set; }
-
 	private string DateRoundingValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? IndexNameFormatValue { get; set; }
-
 	private string? IndexNamePrefixValue { get; set; }
-
 	private string? LocaleValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private string? TimezoneValue { get; set; }
 
 	public DateIndexNameProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -145,6 +127,9 @@ public DateIndexNameProcessorDescriptor<TDocument> DateFormats(ICollection<strin
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>How to round the date when formatting the date into the index name. Valid values are:<br/>`y` (year), `M` (month), `w` (week), `d` (day), `h` (hour), `m` (minute) and `s` (second).<br/>Supports template snippets.</para>
+	/// </summary>
 	public DateIndexNameProcessorDescriptor<TDocument> DateRounding(string dateRounding)
 	{
 		DateRoundingValue = dateRounding;
@@ -306,38 +291,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DateIndexNameProcessorDescriptor : SerializableDescriptor<DateIndexNameProcessorDescriptor>
 {
 	internal DateIndexNameProcessorDescriptor(Action<DateIndexNameProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public DateIndexNameProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private ICollection<string> DateFormatsValue { get; set; }
-
 	private string DateRoundingValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? IndexNameFormatValue { get; set; }
-
 	private string? IndexNamePrefixValue { get; set; }
-
 	private string? LocaleValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private string? TimezoneValue { get; set; }
 
 	public DateIndexNameProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -382,6 +354,9 @@ public DateIndexNameProcessorDescriptor DateFormats(ICollection<string> dateForm
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>How to round the date when formatting the date into the index name. Valid values are:<br/>`y` (year), `M` (month), `w` (week), `d` (day), `h` (hour), `m` (minute) and `s` (second).<br/>Supports template snippets.</para>
+	/// </summary>
 	public DateIndexNameProcessorDescriptor DateRounding(string dateRounding)
 	{
 		DateRoundingValue = dateRounding;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DateProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DateProcessor.g.cs
index 42c9ec0b373..c2b49c2f4f1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DateProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DateProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class DateProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("formats")]
 	public ICollection<string> Formats { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("locale")]
 	public string? Locale { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
-
 	[JsonInclude, JsonPropertyName("timezone")]
 	public string? Timezone { get; set; }
 
@@ -63,34 +56,23 @@ public sealed partial class DateProcessor
 public sealed partial class DateProcessorDescriptor<TDocument> : SerializableDescriptor<DateProcessorDescriptor<TDocument>>
 {
 	internal DateProcessorDescriptor(Action<DateProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DateProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private ICollection<string> FormatsValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? LocaleValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
-
 	private string? TimezoneValue { get; set; }
 
 	public DateProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -282,34 +264,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DateProcessorDescriptor : SerializableDescriptor<DateProcessorDescriptor>
 {
 	internal DateProcessorDescriptor(Action<DateProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public DateProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private ICollection<string> FormatsValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? LocaleValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
-
 	private string? TimezoneValue { get; set; }
 
 	public DateProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DissectProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DissectProcessor.g.cs
index ae953639994..fd9eeb635bb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DissectProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DissectProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class DissectProcessor
 {
 	[JsonInclude, JsonPropertyName("append_separator")]
 	public string? AppendSeparator { get; set; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("pattern")]
 	public string Pattern { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
@@ -60,32 +54,22 @@ public sealed partial class DissectProcessor
 public sealed partial class DissectProcessorDescriptor<TDocument> : SerializableDescriptor<DissectProcessorDescriptor<TDocument>>
 {
 	internal DissectProcessorDescriptor(Action<DissectProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DissectProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? AppendSeparatorValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string PatternValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public DissectProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -259,32 +243,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DissectProcessorDescriptor : SerializableDescriptor<DissectProcessorDescriptor>
 {
 	internal DissectProcessorDescriptor(Action<DissectProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public DissectProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? AppendSeparatorValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string PatternValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public DissectProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Document.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Document.g.cs
index ee237947e54..d249e5cca4e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Document.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Document.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class Document
 {
 	[JsonInclude, JsonPropertyName("_id")]
 	public Elastic.Clients.Elasticsearch.Id? Id { get; set; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("_source")]
 	public object Source { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class Document
 public sealed partial class DocumentDescriptor : SerializableDescriptor<DocumentDescriptor>
 {
 	internal DocumentDescriptor(Action<DocumentDescriptor> configure) => configure.Invoke(this);
+
 	public DocumentDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Id? IdValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName? IndexValue { get; set; }
-
 	private object SourceValue { get; set; }
 
 	public DocumentDescriptor Id(Elastic.Clients.Elasticsearch.Id? id)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DocumentSimulation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DocumentSimulation.g.cs
index 515ba8949f0..74f47bda052 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DocumentSimulation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DocumentSimulation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 internal sealed partial class DocumentSimulationConverter : JsonConverter<DocumentSimulation>
 {
 	public override DocumentSimulation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -92,17 +94,7 @@ public override DocumentSimulation Read(ref Utf8JsonReader reader, Type typeToCo
 			}
 		}
 
-		return new DocumentSimulation
-		{
-			Id = id,
-			Index = index,
-			Ingest = ingest,
-			Routing = routing,
-			Source = source,
-			Version = version,
-			VersionType = versionType,
-			Metadata = additionalProperties
-		};
+		return new DocumentSimulation { Id = id, Index = index, Ingest = ingest, Routing = routing, Source = source, Version = version, VersionType = versionType, Metadata = additionalProperties };
 	}
 
 	public override void Write(Utf8JsonWriter writer, DocumentSimulation value, JsonSerializerOptions options)
@@ -112,22 +104,18 @@ public override void Write(Utf8JsonWriter writer, DocumentSimulation value, Json
 }
 
 [JsonConverter(typeof(DocumentSimulationConverter))]
+/// <summary>
+/// <para>The simulated document, with optional metadata.</para>
+/// </summary>
 public sealed partial class DocumentSimulation
 {
 	public string Id { get; init; }
-
 	public string Index { get; init; }
-
 	public Elastic.Clients.Elasticsearch.Ingest.IngestInfo Ingest { get; init; }
-
 	public string? Routing { get; init; }
-
 	public IReadOnlyDictionary<string, object> Source { get; init; }
-
 	[JsonConverter(typeof(StringifiedLongConverter))]
 	public long? Version { get; init; }
-
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get; init; }
-
 	public IReadOnlyDictionary<string, string> Metadata { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DotExpanderProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DotExpanderProcessor.g.cs
index aba6c90a210..c584f4949bb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DotExpanderProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DotExpanderProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class DotExpanderProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("path")]
 	public string? Path { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
@@ -54,28 +50,20 @@ public sealed partial class DotExpanderProcessor
 public sealed partial class DotExpanderProcessorDescriptor<TDocument> : SerializableDescriptor<DotExpanderProcessorDescriptor<TDocument>>
 {
 	internal DotExpanderProcessorDescriptor(Action<DotExpanderProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DotExpanderProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? PathValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public DotExpanderProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -229,28 +217,20 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DotExpanderProcessorDescriptor : SerializableDescriptor<DotExpanderProcessorDescriptor>
 {
 	internal DotExpanderProcessorDescriptor(Action<DotExpanderProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public DotExpanderProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? PathValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public DotExpanderProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DropProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DropProcessor.g.cs
index e5a060433e1..b6e2ef4e742 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DropProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/DropProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class DropProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
@@ -48,24 +46,18 @@ public sealed partial class DropProcessor
 public sealed partial class DropProcessorDescriptor<TDocument> : SerializableDescriptor<DropProcessorDescriptor<TDocument>>
 {
 	internal DropProcessorDescriptor(Action<DropProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DropProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public DropProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -193,24 +185,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DropProcessorDescriptor : SerializableDescriptor<DropProcessorDescriptor>
 {
 	internal DropProcessorDescriptor(Action<DropProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public DropProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public DropProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/EnrichProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/EnrichProcessor.g.cs
index c251ef93b64..3eecae42646 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/EnrichProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/EnrichProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,43 +25,32 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class EnrichProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_matches")]
 	public int? MaxMatches { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("override")]
 	public bool? Override { get; set; }
-
 	[JsonInclude, JsonPropertyName("policy_name")]
 	public string PolicyName { get; set; }
-
 	[JsonInclude, JsonPropertyName("shape_relation")]
 	public Elastic.Clients.Elasticsearch.GeoShapeRelation? ShapeRelation { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field TargetField { get; set; }
 
@@ -69,38 +60,25 @@ public sealed partial class EnrichProcessor
 public sealed partial class EnrichProcessorDescriptor<TDocument> : SerializableDescriptor<EnrichProcessorDescriptor<TDocument>>
 {
 	internal EnrichProcessorDescriptor(Action<EnrichProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public EnrichProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private int? MaxMatchesValue { get; set; }
-
 	private bool? OverrideValue { get; set; }
-
 	private string PolicyNameValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoShapeRelation? ShapeRelationValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field TargetFieldValue { get; set; }
 
 	public EnrichProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -312,38 +290,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class EnrichProcessorDescriptor : SerializableDescriptor<EnrichProcessorDescriptor>
 {
 	internal EnrichProcessorDescriptor(Action<EnrichProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public EnrichProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private int? MaxMatchesValue { get; set; }
-
 	private bool? OverrideValue { get; set; }
-
 	private string PolicyNameValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoShapeRelation? ShapeRelationValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field TargetFieldValue { get; set; }
 
 	public EnrichProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/FailProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/FailProcessor.g.cs
index 794babbc81d..0a603ce1600 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/FailProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/FailProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class FailProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("message")]
 	public string Message { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
@@ -51,26 +48,19 @@ public sealed partial class FailProcessor
 public sealed partial class FailProcessorDescriptor<TDocument> : SerializableDescriptor<FailProcessorDescriptor<TDocument>>
 {
 	internal FailProcessorDescriptor(Action<FailProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FailProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string MessageValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public FailProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -206,26 +196,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FailProcessorDescriptor : SerializableDescriptor<FailProcessorDescriptor>
 {
 	internal FailProcessorDescriptor(Action<FailProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public FailProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string MessageValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public FailProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/ForeachProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/ForeachProcessor.g.cs
index 554dbfd8127..8a7a8a12431 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/ForeachProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/ForeachProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class ForeachProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("processor")]
 	public Elastic.Clients.Elasticsearch.Ingest.Processor Processor { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
@@ -57,34 +52,23 @@ public sealed partial class ForeachProcessor
 public sealed partial class ForeachProcessorDescriptor<TDocument> : SerializableDescriptor<ForeachProcessorDescriptor<TDocument>>
 {
 	internal ForeachProcessorDescriptor(Action<ForeachProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ForeachProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ingest.Processor ProcessorValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> ProcessorDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> ProcessorDescriptorAction { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public ForeachProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -278,34 +262,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ForeachProcessorDescriptor : SerializableDescriptor<ForeachProcessorDescriptor>
 {
 	internal ForeachProcessorDescriptor(Action<ForeachProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public ForeachProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ingest.Processor ProcessorValue { get; set; }
-
 	private ProcessorDescriptor ProcessorDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> ProcessorDescriptorAction { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public ForeachProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
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 497bca19163..fe08271caa8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpDownloadStatistics.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpDownloadStatistics.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,37 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class GeoIpDownloadStatistics
 {
+	/// <summary>
+	/// <para>Current number of databases available for use.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("database_count")]
 	public int DatabaseCount { get; init; }
 
+	/// <summary>
+	/// <para>Total number of failed database downloads.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("failed_downloads")]
 	public int FailedDownloads { get; init; }
 
+	/// <summary>
+	/// <para>Total number of database updates skipped.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("skipped_updates")]
 	public int SkippedUpdates { get; init; }
 
+	/// <summary>
+	/// <para>Total number of successful database downloads.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("successful_downloads")]
 	public int SuccessfulDownloads { get; init; }
 
+	/// <summary>
+	/// <para>Total milliseconds spent downloading databases.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("total_download_time")]
 	public long TotalDownloadTime { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpNodeDatabaseName.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpNodeDatabaseName.g.cs
index 144ab6feffc..58308819128 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpNodeDatabaseName.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpNodeDatabaseName.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,10 +25,13 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class GeoIpNodeDatabaseName
 {
+	/// <summary>
+	/// <para>Name of the database.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpNodeDatabases.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpNodeDatabases.g.cs
index 0f1f6bf8c0e..cab399570d9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpNodeDatabases.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpNodeDatabases.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
+/// <summary>
+/// <para>Downloaded databases for the node. The field key is the node ID.</para>
+/// </summary>
 public sealed partial class GeoIpNodeDatabases
 {
+	/// <summary>
+	/// <para>Downloaded databases for the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("databases")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Ingest.GeoIpNodeDatabaseName> Databases { get; init; }
 
+	/// <summary>
+	/// <para>Downloaded database files, including related license files. Elasticsearch stores these files in the node’s temporary directory: $ES_TMPDIR/geoip-databases/<node_id>.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("files_in_temp")]
 	public IReadOnlyCollection<string> FilesInTemp { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpProcessor.g.cs
index 8f9d53a6f53..dbb5d90a79c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GeoIpProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,40 +25,30 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class GeoIpProcessor
 {
 	[JsonInclude, JsonPropertyName("database_file")]
 	public string? DatabaseFile { get; set; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("first_only")]
 	public bool? FirstOnly { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public ICollection<string>? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -66,36 +58,24 @@ public sealed partial class GeoIpProcessor
 public sealed partial class GeoIpProcessorDescriptor<TDocument> : SerializableDescriptor<GeoIpProcessorDescriptor<TDocument>>
 {
 	internal GeoIpProcessorDescriptor(Action<GeoIpProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GeoIpProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DatabaseFileValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private bool? FirstOnlyValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private ICollection<string>? PropertiesValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public GeoIpProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -303,36 +283,24 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class GeoIpProcessorDescriptor : SerializableDescriptor<GeoIpProcessorDescriptor>
 {
 	internal GeoIpProcessorDescriptor(Action<GeoIpProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public GeoIpProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DatabaseFileValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private bool? FirstOnlyValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private ICollection<string>? PropertiesValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public GeoIpProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GrokProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GrokProcessor.g.cs
index 2fc58c67771..1d2e2f07d4b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GrokProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GrokProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class GrokProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("pattern_definitions")]
 	public IDictionary<string, string>? PatternDefinitions { get; set; }
-
 	[JsonInclude, JsonPropertyName("patterns")]
 	public ICollection<string> Patterns { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("trace_match")]
 	public bool? TraceMatch { get; set; }
 
@@ -63,34 +56,23 @@ public sealed partial class GrokProcessor
 public sealed partial class GrokProcessorDescriptor<TDocument> : SerializableDescriptor<GrokProcessorDescriptor<TDocument>>
 {
 	internal GrokProcessorDescriptor(Action<GrokProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GrokProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private IDictionary<string, string>? PatternDefinitionsValue { get; set; }
-
 	private ICollection<string> PatternsValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private bool? TraceMatchValue { get; set; }
 
 	public GrokProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -276,34 +258,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class GrokProcessorDescriptor : SerializableDescriptor<GrokProcessorDescriptor>
 {
 	internal GrokProcessorDescriptor(Action<GrokProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public GrokProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private IDictionary<string, string>? PatternDefinitionsValue { get; set; }
-
 	private ICollection<string> PatternsValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private bool? TraceMatchValue { get; set; }
 
 	public GrokProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GsubProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GsubProcessor.g.cs
index 07de78ec565..3e655c535eb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GsubProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/GsubProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class GsubProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("pattern")]
 	public string Pattern { get; set; }
-
 	[JsonInclude, JsonPropertyName("replacement")]
 	public string Replacement { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -63,34 +56,23 @@ public sealed partial class GsubProcessor
 public sealed partial class GsubProcessorDescriptor<TDocument> : SerializableDescriptor<GsubProcessorDescriptor<TDocument>>
 {
 	internal GsubProcessorDescriptor(Action<GsubProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GsubProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string PatternValue { get; set; }
-
 	private string ReplacementValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public GsubProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -278,34 +260,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class GsubProcessorDescriptor : SerializableDescriptor<GsubProcessorDescriptor>
 {
 	internal GsubProcessorDescriptor(Action<GsubProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public GsubProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string PatternValue { get; set; }
-
 	private string ReplacementValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public GsubProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfig.g.cs
index 60c24dfe909..982b97f26a3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfig.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 [JsonConverter(typeof(InferenceConfigConverter))]
 public sealed partial class InferenceConfig
 {
@@ -41,7 +43,6 @@ internal InferenceConfig(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static InferenceConfig Classification(Elastic.Clients.Elasticsearch.Ingest.InferenceConfigClassification inferenceConfigClassification) => new InferenceConfig("classification", inferenceConfigClassification);
@@ -103,20 +104,17 @@ public override void Write(Utf8JsonWriter writer, InferenceConfig value, JsonSer
 public sealed partial class InferenceConfigDescriptor<TDocument> : SerializableDescriptor<InferenceConfigDescriptor<TDocument>>
 {
 	internal InferenceConfigDescriptor(Action<InferenceConfigDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public InferenceConfigDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private InferenceConfigDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private InferenceConfigDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -138,6 +136,7 @@ private InferenceConfigDescriptor<TDocument> Set(object variant, string variantN
 	public InferenceConfigDescriptor<TDocument> Classification(Action<InferenceConfigClassificationDescriptor<TDocument>> configure) => Set(configure, "classification");
 	public InferenceConfigDescriptor<TDocument> Regression(InferenceConfigRegression inferenceConfigRegression) => Set(inferenceConfigRegression, "regression");
 	public InferenceConfigDescriptor<TDocument> Regression(Action<InferenceConfigRegressionDescriptor<TDocument>> configure) => Set(configure, "regression");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -163,20 +162,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class InferenceConfigDescriptor : SerializableDescriptor<InferenceConfigDescriptor>
 {
 	internal InferenceConfigDescriptor(Action<InferenceConfigDescriptor> configure) => configure.Invoke(this);
+
 	public InferenceConfigDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private InferenceConfigDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private InferenceConfigDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -200,6 +196,7 @@ private InferenceConfigDescriptor Set(object variant, string variantName)
 	public InferenceConfigDescriptor Regression(InferenceConfigRegression inferenceConfigRegression) => Set(inferenceConfigRegression, "regression");
 	public InferenceConfigDescriptor Regression(Action<InferenceConfigRegressionDescriptor> configure) => Set(configure, "regression");
 	public InferenceConfigDescriptor Regression<TDocument>(Action<InferenceConfigRegressionDescriptor<TDocument>> configure) => Set(configure, "regression");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfigClassification.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfigClassification.g.cs
index abe776f60d7..dc41f825bf8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfigClassification.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfigClassification.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class InferenceConfigClassification
 {
 	[JsonInclude, JsonPropertyName("num_top_classes")]
 	public int? NumTopClasses { get; set; }
-
 	[JsonInclude, JsonPropertyName("num_top_feature_importance_values")]
 	public int? NumTopFeatureImportanceValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("prediction_field_type")]
 	public string? PredictionFieldType { get; set; }
-
 	[JsonInclude, JsonPropertyName("results_field")]
 	public Elastic.Clients.Elasticsearch.Field? ResultsField { get; set; }
-
 	[JsonInclude, JsonPropertyName("top_classes_results_field")]
 	public Elastic.Clients.Elasticsearch.Field? TopClassesResultsField { get; set; }
 
@@ -48,18 +46,15 @@ public sealed partial class InferenceConfigClassification
 public sealed partial class InferenceConfigClassificationDescriptor<TDocument> : SerializableDescriptor<InferenceConfigClassificationDescriptor<TDocument>>
 {
 	internal InferenceConfigClassificationDescriptor(Action<InferenceConfigClassificationDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public InferenceConfigClassificationDescriptor() : base()
 	{
 	}
 
 	private int? NumTopClassesValue { get; set; }
-
 	private int? NumTopFeatureImportanceValuesValue { get; set; }
-
 	private string? PredictionFieldTypeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TopClassesResultsFieldValue { get; set; }
 
 	public InferenceConfigClassificationDescriptor<TDocument> NumTopClasses(int? numTopClasses)
@@ -144,18 +139,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class InferenceConfigClassificationDescriptor : SerializableDescriptor<InferenceConfigClassificationDescriptor>
 {
 	internal InferenceConfigClassificationDescriptor(Action<InferenceConfigClassificationDescriptor> configure) => configure.Invoke(this);
+
 	public InferenceConfigClassificationDescriptor() : base()
 	{
 	}
 
 	private int? NumTopClassesValue { get; set; }
-
 	private int? NumTopFeatureImportanceValuesValue { get; set; }
-
 	private string? PredictionFieldTypeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TopClassesResultsFieldValue { get; set; }
 
 	public InferenceConfigClassificationDescriptor NumTopClasses(int? numTopClasses)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfigRegression.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfigRegression.g.cs
index 8ad62234bac..c0a5edfef87 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfigRegression.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceConfigRegression.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class InferenceConfigRegression
 {
 	[JsonInclude, JsonPropertyName("num_top_feature_importance_values")]
 	public int? NumTopFeatureImportanceValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("results_field")]
 	public Elastic.Clients.Elasticsearch.Field? ResultsField { get; set; }
 
@@ -39,12 +40,12 @@ public sealed partial class InferenceConfigRegression
 public sealed partial class InferenceConfigRegressionDescriptor<TDocument> : SerializableDescriptor<InferenceConfigRegressionDescriptor<TDocument>>
 {
 	internal InferenceConfigRegressionDescriptor(Action<InferenceConfigRegressionDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public InferenceConfigRegressionDescriptor() : base()
 	{
 	}
 
 	private int? NumTopFeatureImportanceValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? ResultsFieldValue { get; set; }
 
 	public InferenceConfigRegressionDescriptor<TDocument> NumTopFeatureImportanceValues(int? numTopFeatureImportanceValues)
@@ -87,12 +88,12 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class InferenceConfigRegressionDescriptor : SerializableDescriptor<InferenceConfigRegressionDescriptor>
 {
 	internal InferenceConfigRegressionDescriptor(Action<InferenceConfigRegressionDescriptor> configure) => configure.Invoke(this);
+
 	public InferenceConfigRegressionDescriptor() : base()
 	{
 	}
 
 	private int? NumTopFeatureImportanceValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? ResultsFieldValue { get; set; }
 
 	public InferenceConfigRegressionDescriptor NumTopFeatureImportanceValues(int? numTopFeatureImportanceValues)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceProcessor.g.cs
index 5f6ace46020..98a05036569 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/InferenceProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class InferenceProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field_map")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, object>? FieldMap { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("inference_config")]
 	public Elastic.Clients.Elasticsearch.Ingest.InferenceConfig? InferenceConfig { get; set; }
-
 	[JsonInclude, JsonPropertyName("model_id")]
 	public Elastic.Clients.Elasticsearch.Id ModelId { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -60,36 +54,24 @@ public sealed partial class InferenceProcessor
 public sealed partial class InferenceProcessorDescriptor<TDocument> : SerializableDescriptor<InferenceProcessorDescriptor<TDocument>>
 {
 	internal InferenceProcessorDescriptor(Action<InferenceProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public InferenceProcessorDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Ingest.InferenceConfig? InferenceConfigValue { get; set; }
-
 	private InferenceConfigDescriptor<TDocument> InferenceConfigDescriptor { get; set; }
-
 	private Action<InferenceConfigDescriptor<TDocument>> InferenceConfigDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, object>? FieldMapValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id ModelIdValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public InferenceProcessorDescriptor<TDocument> InferenceConfig(Elastic.Clients.Elasticsearch.Ingest.InferenceConfig? inferenceConfig)
@@ -295,36 +277,24 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class InferenceProcessorDescriptor : SerializableDescriptor<InferenceProcessorDescriptor>
 {
 	internal InferenceProcessorDescriptor(Action<InferenceProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public InferenceProcessorDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Ingest.InferenceConfig? InferenceConfigValue { get; set; }
-
 	private InferenceConfigDescriptor InferenceConfigDescriptor { get; set; }
-
 	private Action<InferenceConfigDescriptor> InferenceConfigDescriptorAction { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, object>? FieldMapValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id ModelIdValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public InferenceProcessorDescriptor InferenceConfig(Elastic.Clients.Elasticsearch.Ingest.InferenceConfig? inferenceConfig)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/IngestInfo.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/IngestInfo.g.cs
index 891304c5635..fed73dac315 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/IngestInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/IngestInfo.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class IngestInfo
 {
 	[JsonInclude, JsonPropertyName("pipeline")]
 	public string? Pipeline { get; init; }
-
 	[JsonInclude, JsonPropertyName("timestamp")]
 	public DateTimeOffset Timestamp { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/JoinProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/JoinProcessor.g.cs
index 99b77bd6326..9bd305dca91 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/JoinProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/JoinProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class JoinProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("separator")]
 	public string Separator { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -57,30 +52,21 @@ public sealed partial class JoinProcessor
 public sealed partial class JoinProcessorDescriptor<TDocument> : SerializableDescriptor<JoinProcessorDescriptor<TDocument>>
 {
 	internal JoinProcessorDescriptor(Action<JoinProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public JoinProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string SeparatorValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public JoinProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -248,30 +234,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class JoinProcessorDescriptor : SerializableDescriptor<JoinProcessorDescriptor>
 {
 	internal JoinProcessorDescriptor(Action<JoinProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public JoinProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string SeparatorValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public JoinProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/JsonProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/JsonProcessor.g.cs
index e8549b0235a..dfb1f84df4d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/JsonProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/JsonProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class JsonProcessor
 {
 	[JsonInclude, JsonPropertyName("add_to_root")]
 	public bool? AddToRoot { get; set; }
-
 	[JsonInclude, JsonPropertyName("add_to_root_conflict_strategy")]
 	public Elastic.Clients.Elasticsearch.Ingest.JsonProcessorConflictStrategy? AddToRootConflictStrategy { get; set; }
-
 	[JsonInclude, JsonPropertyName("allow_duplicate_keys")]
 	public bool? AllowDuplicateKeys { get; set; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -63,34 +56,23 @@ public sealed partial class JsonProcessor
 public sealed partial class JsonProcessorDescriptor<TDocument> : SerializableDescriptor<JsonProcessorDescriptor<TDocument>>
 {
 	internal JsonProcessorDescriptor(Action<JsonProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public JsonProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private bool? AddToRootValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ingest.JsonProcessorConflictStrategy? AddToRootConflictStrategyValue { get; set; }
-
 	private bool? AllowDuplicateKeysValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public JsonProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -286,34 +268,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class JsonProcessorDescriptor : SerializableDescriptor<JsonProcessorDescriptor>
 {
 	internal JsonProcessorDescriptor(Action<JsonProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public JsonProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private bool? AddToRootValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ingest.JsonProcessorConflictStrategy? AddToRootConflictStrategyValue { get; set; }
-
 	private bool? AllowDuplicateKeysValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public JsonProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/KeyValueProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/KeyValueProcessor.g.cs
index 23734cba613..16253ccf48c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/KeyValueProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/KeyValueProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,55 +25,40 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class KeyValueProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("exclude_keys")]
 	public ICollection<string>? ExcludeKeys { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("field_split")]
 	public string FieldSplit { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("include_keys")]
 	public ICollection<string>? IncludeKeys { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("prefix")]
 	public string? Prefix { get; set; }
-
 	[JsonInclude, JsonPropertyName("strip_brackets")]
 	public bool? StripBrackets { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
-
 	[JsonInclude, JsonPropertyName("trim_key")]
 	public string? TrimKey { get; set; }
-
 	[JsonInclude, JsonPropertyName("trim_value")]
 	public string? TrimValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("value_split")]
 	public string ValueSplit { get; set; }
 
@@ -81,46 +68,29 @@ public sealed partial class KeyValueProcessor
 public sealed partial class KeyValueProcessorDescriptor<TDocument> : SerializableDescriptor<KeyValueProcessorDescriptor<TDocument>>
 {
 	internal KeyValueProcessorDescriptor(Action<KeyValueProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public KeyValueProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private ICollection<string>? ExcludeKeysValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string FieldSplitValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private ICollection<string>? IncludeKeysValue { get; set; }
-
 	private string? PrefixValue { get; set; }
-
 	private bool? StripBracketsValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
-
 	private string? TrimKeyValue { get; set; }
-
 	private string? TrimValueValue { get; set; }
-
 	private string ValueSplitValue { get; set; }
 
 	public KeyValueProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -380,46 +350,29 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class KeyValueProcessorDescriptor : SerializableDescriptor<KeyValueProcessorDescriptor>
 {
 	internal KeyValueProcessorDescriptor(Action<KeyValueProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public KeyValueProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private ICollection<string>? ExcludeKeysValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string FieldSplitValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private ICollection<string>? IncludeKeysValue { get; set; }
-
 	private string? PrefixValue { get; set; }
-
 	private bool? StripBracketsValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
-
 	private string? TrimKeyValue { get; set; }
-
 	private string? TrimValueValue { get; set; }
-
 	private string ValueSplitValue { get; set; }
 
 	public KeyValueProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/LowercaseProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/LowercaseProcessor.g.cs
index 6e153dfd7f7..d79b4613972 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/LowercaseProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/LowercaseProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class LowercaseProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -57,30 +52,21 @@ public sealed partial class LowercaseProcessor
 public sealed partial class LowercaseProcessorDescriptor<TDocument> : SerializableDescriptor<LowercaseProcessorDescriptor<TDocument>>
 {
 	internal LowercaseProcessorDescriptor(Action<LowercaseProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public LowercaseProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public LowercaseProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -252,30 +238,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class LowercaseProcessorDescriptor : SerializableDescriptor<LowercaseProcessorDescriptor>
 {
 	internal LowercaseProcessorDescriptor(Action<LowercaseProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public LowercaseProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public LowercaseProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Pipeline.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Pipeline.g.cs
index b99696cc741..78618a4a386 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Pipeline.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Pipeline.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class Pipeline
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("processors")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? Processors { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
 }
@@ -43,28 +42,20 @@ public sealed partial class Pipeline
 public sealed partial class PipelineDescriptor<TDocument> : SerializableDescriptor<PipelineDescriptor<TDocument>>
 {
 	internal PipelineDescriptor(Action<PipelineDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PipelineDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? ProcessorsValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> ProcessorsDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> ProcessorsDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] ProcessorsDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private long? VersionValue { get; set; }
 
 	public PipelineDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -235,28 +226,20 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class PipelineDescriptor : SerializableDescriptor<PipelineDescriptor>
 {
 	internal PipelineDescriptor(Action<PipelineDescriptor> configure) => configure.Invoke(this);
+
 	public PipelineDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? ProcessorsValue { get; set; }
-
 	private ProcessorDescriptor ProcessorsDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> ProcessorsDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] ProcessorsDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private long? VersionValue { get; set; }
 
 	public PipelineDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/PipelineProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/PipelineProcessor.g.cs
index 5d025c6a1d4..437b590cf53 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/PipelineProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/PipelineProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class PipelineProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing_pipeline")]
 	public bool? IgnoreMissingPipeline { get; set; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public Elastic.Clients.Elasticsearch.Name Name { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
@@ -54,28 +50,20 @@ public sealed partial class PipelineProcessor
 public sealed partial class PipelineProcessorDescriptor<TDocument> : SerializableDescriptor<PipelineProcessorDescriptor<TDocument>>
 {
 	internal PipelineProcessorDescriptor(Action<PipelineProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PipelineProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingPipelineValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Name NameValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public PipelineProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -223,28 +211,20 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class PipelineProcessorDescriptor : SerializableDescriptor<PipelineProcessorDescriptor>
 {
 	internal PipelineProcessorDescriptor(Action<PipelineProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public PipelineProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingPipelineValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Name NameValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public PipelineProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/PipelineSimulation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/PipelineSimulation.g.cs
index fbff90c532f..63b4a3ee3a1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/PipelineSimulation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/PipelineSimulation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class PipelineSimulation
 {
 	[JsonInclude, JsonPropertyName("doc")]
 	public Elastic.Clients.Elasticsearch.Ingest.DocumentSimulation? Doc { get; init; }
-
 	[JsonInclude, JsonPropertyName("processor_results")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Ingest.PipelineSimulation>? ProcessorResults { get; init; }
-
 	[JsonInclude, JsonPropertyName("processor_type")]
 	public string? ProcessorType { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.Watcher.ActionStatusOptions? Status { get; init; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Processor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Processor.g.cs
index 7ef372f2a7a..2529c77f129 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Processor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/Processor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 [JsonConverter(typeof(ProcessorConverter))]
 public sealed partial class Processor
 {
@@ -41,7 +43,6 @@ internal Processor(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static Processor Append(Elastic.Clients.Elasticsearch.Ingest.AppendProcessor appendProcessor) => new Processor("append", appendProcessor);
@@ -75,7 +76,7 @@ internal Processor(string variantName, object variant)
 	public static Processor Split(Elastic.Clients.Elasticsearch.Ingest.SplitProcessor splitProcessor) => new Processor("split", splitProcessor);
 	public static Processor Trim(Elastic.Clients.Elasticsearch.Ingest.TrimProcessor trimProcessor) => new Processor("trim", trimProcessor);
 	public static Processor Uppercase(Elastic.Clients.Elasticsearch.Ingest.UppercaseProcessor uppercaseProcessor) => new Processor("uppercase", uppercaseProcessor);
-	public static Processor Urldecode(Elastic.Clients.Elasticsearch.Ingest.UrlDecodeProcessor urlDecodeProcessor) => new Processor("urldecode", urlDecodeProcessor);
+	public static Processor UrlDecode(Elastic.Clients.Elasticsearch.Ingest.UrlDecodeProcessor urlDecodeProcessor) => new Processor("urldecode", urlDecodeProcessor);
 	public static Processor UserAgent(Elastic.Clients.Elasticsearch.Ingest.UserAgentProcessor userAgentProcessor) => new Processor("user_agent", userAgentProcessor);
 }
 
@@ -444,20 +445,17 @@ public override void Write(Utf8JsonWriter writer, Processor value, JsonSerialize
 public sealed partial class ProcessorDescriptor<TDocument> : SerializableDescriptor<ProcessorDescriptor<TDocument>>
 {
 	internal ProcessorDescriptor(Action<ProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ProcessorDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private ProcessorDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private ProcessorDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -537,10 +535,11 @@ private ProcessorDescriptor<TDocument> Set(object variant, string variantName)
 	public ProcessorDescriptor<TDocument> Trim(Action<TrimProcessorDescriptor<TDocument>> configure) => Set(configure, "trim");
 	public ProcessorDescriptor<TDocument> Uppercase(UppercaseProcessor uppercaseProcessor) => Set(uppercaseProcessor, "uppercase");
 	public ProcessorDescriptor<TDocument> Uppercase(Action<UppercaseProcessorDescriptor<TDocument>> configure) => Set(configure, "uppercase");
-	public ProcessorDescriptor<TDocument> Urldecode(UrlDecodeProcessor urlDecodeProcessor) => Set(urlDecodeProcessor, "urldecode");
-	public ProcessorDescriptor<TDocument> Urldecode(Action<UrlDecodeProcessorDescriptor<TDocument>> configure) => Set(configure, "urldecode");
+	public ProcessorDescriptor<TDocument> UrlDecode(UrlDecodeProcessor urlDecodeProcessor) => Set(urlDecodeProcessor, "urldecode");
+	public ProcessorDescriptor<TDocument> UrlDecode(Action<UrlDecodeProcessorDescriptor<TDocument>> configure) => Set(configure, "urldecode");
 	public ProcessorDescriptor<TDocument> UserAgent(UserAgentProcessor userAgentProcessor) => Set(userAgentProcessor, "user_agent");
 	public ProcessorDescriptor<TDocument> UserAgent(Action<UserAgentProcessorDescriptor<TDocument>> configure) => Set(configure, "user_agent");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -566,20 +565,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ProcessorDescriptor : SerializableDescriptor<ProcessorDescriptor>
 {
 	internal ProcessorDescriptor(Action<ProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public ProcessorDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private ProcessorDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private ProcessorDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -690,12 +686,13 @@ private ProcessorDescriptor Set(object variant, string variantName)
 	public ProcessorDescriptor Uppercase(UppercaseProcessor uppercaseProcessor) => Set(uppercaseProcessor, "uppercase");
 	public ProcessorDescriptor Uppercase(Action<UppercaseProcessorDescriptor> configure) => Set(configure, "uppercase");
 	public ProcessorDescriptor Uppercase<TDocument>(Action<UppercaseProcessorDescriptor<TDocument>> configure) => Set(configure, "uppercase");
-	public ProcessorDescriptor Urldecode(UrlDecodeProcessor urlDecodeProcessor) => Set(urlDecodeProcessor, "urldecode");
-	public ProcessorDescriptor Urldecode(Action<UrlDecodeProcessorDescriptor> configure) => Set(configure, "urldecode");
-	public ProcessorDescriptor Urldecode<TDocument>(Action<UrlDecodeProcessorDescriptor<TDocument>> configure) => Set(configure, "urldecode");
+	public ProcessorDescriptor UrlDecode(UrlDecodeProcessor urlDecodeProcessor) => Set(urlDecodeProcessor, "urldecode");
+	public ProcessorDescriptor UrlDecode(Action<UrlDecodeProcessorDescriptor> configure) => Set(configure, "urldecode");
+	public ProcessorDescriptor UrlDecode<TDocument>(Action<UrlDecodeProcessorDescriptor<TDocument>> configure) => Set(configure, "urldecode");
 	public ProcessorDescriptor UserAgent(UserAgentProcessor userAgentProcessor) => Set(userAgentProcessor, "user_agent");
 	public ProcessorDescriptor UserAgent(Action<UserAgentProcessorDescriptor> configure) => Set(configure, "user_agent");
 	public ProcessorDescriptor UserAgent<TDocument>(Action<UserAgentProcessorDescriptor<TDocument>> configure) => Set(configure, "user_agent");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RemoveProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RemoveProcessor.g.cs
index 6c5f518076c..33bc8d513be 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RemoveProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RemoveProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class RemoveProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Fields Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
@@ -54,28 +50,20 @@ public sealed partial class RemoveProcessor
 public sealed partial class RemoveProcessorDescriptor<TDocument> : SerializableDescriptor<RemoveProcessorDescriptor<TDocument>>
 {
 	internal RemoveProcessorDescriptor(Action<RemoveProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RemoveProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public RemoveProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -223,28 +211,20 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RemoveProcessorDescriptor : SerializableDescriptor<RemoveProcessorDescriptor>
 {
 	internal RemoveProcessorDescriptor(Action<RemoveProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public RemoveProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public RemoveProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RenameProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RenameProcessor.g.cs
index a579f2c28f9..05d6f6025ff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RenameProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/RenameProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class RenameProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field TargetField { get; set; }
 
@@ -57,30 +52,21 @@ public sealed partial class RenameProcessor
 public sealed partial class RenameProcessorDescriptor<TDocument> : SerializableDescriptor<RenameProcessorDescriptor<TDocument>>
 {
 	internal RenameProcessorDescriptor(Action<RenameProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RenameProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field TargetFieldValue { get; set; }
 
 	public RenameProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -248,30 +234,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RenameProcessorDescriptor : SerializableDescriptor<RenameProcessorDescriptor>
 {
 	internal RenameProcessorDescriptor(Action<RenameProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public RenameProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field TargetFieldValue { get; set; }
 
 	public RenameProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SetProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SetProcessor.g.cs
index b3d2c557f83..383d536b67e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SetProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SetProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,40 +25,30 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class SetProcessor
 {
 	[JsonInclude, JsonPropertyName("copy_from")]
 	public Elastic.Clients.Elasticsearch.Field? CopyFrom { get; set; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_empty_value")]
 	public bool? IgnoreEmptyValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("media_type")]
 	public string? MediaType { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("override")]
 	public bool? Override { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("value")]
 	public object? Value { get; set; }
 
@@ -66,36 +58,24 @@ public sealed partial class SetProcessor
 public sealed partial class SetProcessorDescriptor<TDocument> : SerializableDescriptor<SetProcessorDescriptor<TDocument>>
 {
 	internal SetProcessorDescriptor(Action<SetProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SetProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? CopyFromValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreEmptyValueValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? MediaTypeValue { get; set; }
-
 	private bool? OverrideValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private object? ValueValue { get; set; }
 
 	public SetProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -303,36 +283,24 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SetProcessorDescriptor : SerializableDescriptor<SetProcessorDescriptor>
 {
 	internal SetProcessorDescriptor(Action<SetProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public SetProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? CopyFromValue { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreEmptyValueValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private string? MediaTypeValue { get; set; }
-
 	private bool? OverrideValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private object? ValueValue { get; set; }
 
 	public SetProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SetSecurityUserProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SetSecurityUserProcessor.g.cs
index ee46ca2cb28..05dc571526e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SetSecurityUserProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SetSecurityUserProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class SetSecurityUserProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public ICollection<string>? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
 
@@ -54,28 +50,20 @@ public sealed partial class SetSecurityUserProcessor
 public sealed partial class SetSecurityUserProcessorDescriptor<TDocument> : SerializableDescriptor<SetSecurityUserProcessorDescriptor<TDocument>>
 {
 	internal SetSecurityUserProcessorDescriptor(Action<SetSecurityUserProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SetSecurityUserProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private ICollection<string>? PropertiesValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public SetSecurityUserProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -229,28 +217,20 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SetSecurityUserProcessorDescriptor : SerializableDescriptor<SetSecurityUserProcessorDescriptor>
 {
 	internal SetSecurityUserProcessorDescriptor(Action<SetSecurityUserProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public SetSecurityUserProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private ICollection<string>? PropertiesValue { get; set; }
-
 	private string? TagValue { get; set; }
 
 	public SetSecurityUserProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SortProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SortProcessor.g.cs
index a478e851d44..df761a21ea0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SortProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SortProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class SortProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("order")]
 	public Elastic.Clients.Elasticsearch.SortOrder? Order { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -57,30 +52,21 @@ public sealed partial class SortProcessor
 public sealed partial class SortProcessorDescriptor<TDocument> : SerializableDescriptor<SortProcessorDescriptor<TDocument>>
 {
 	internal SortProcessorDescriptor(Action<SortProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SortProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortOrder? OrderValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public SortProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -252,30 +238,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SortProcessorDescriptor : SerializableDescriptor<SortProcessorDescriptor>
 {
 	internal SortProcessorDescriptor(Action<SortProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public SortProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortOrder? OrderValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public SortProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SplitProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SplitProcessor.g.cs
index 667824a745e..3837a05821b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SplitProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/SplitProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class SplitProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("preserve_trailing")]
 	public bool? PreserveTrailing { get; set; }
-
 	[JsonInclude, JsonPropertyName("separator")]
 	public string Separator { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -63,34 +56,23 @@ public sealed partial class SplitProcessor
 public sealed partial class SplitProcessorDescriptor<TDocument> : SerializableDescriptor<SplitProcessorDescriptor<TDocument>>
 {
 	internal SplitProcessorDescriptor(Action<SplitProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SplitProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private bool? PreserveTrailingValue { get; set; }
-
 	private string SeparatorValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public SplitProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -282,34 +264,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SplitProcessorDescriptor : SerializableDescriptor<SplitProcessorDescriptor>
 {
 	internal SplitProcessorDescriptor(Action<SplitProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public SplitProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private bool? PreserveTrailingValue { get; set; }
-
 	private string SeparatorValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public SplitProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/TrimProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/TrimProcessor.g.cs
index 7d069e798c2..17b69083f84 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/TrimProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/TrimProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class TrimProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -57,30 +52,21 @@ public sealed partial class TrimProcessor
 public sealed partial class TrimProcessorDescriptor<TDocument> : SerializableDescriptor<TrimProcessorDescriptor<TDocument>>
 {
 	internal TrimProcessorDescriptor(Action<TrimProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TrimProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public TrimProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -252,30 +238,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TrimProcessorDescriptor : SerializableDescriptor<TrimProcessorDescriptor>
 {
 	internal TrimProcessorDescriptor(Action<TrimProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public TrimProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public TrimProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UppercaseProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UppercaseProcessor.g.cs
index 8251d4f0863..2cc7f5b74ae 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UppercaseProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UppercaseProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class UppercaseProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -57,30 +52,21 @@ public sealed partial class UppercaseProcessor
 public sealed partial class UppercaseProcessorDescriptor<TDocument> : SerializableDescriptor<UppercaseProcessorDescriptor<TDocument>>
 {
 	internal UppercaseProcessorDescriptor(Action<UppercaseProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public UppercaseProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public UppercaseProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -252,30 +238,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class UppercaseProcessorDescriptor : SerializableDescriptor<UppercaseProcessorDescriptor>
 {
 	internal UppercaseProcessorDescriptor(Action<UppercaseProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public UppercaseProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public UppercaseProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UrlDecodeProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UrlDecodeProcessor.g.cs
index 73920211834..bddf7582a8c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UrlDecodeProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UrlDecodeProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,64 +25,48 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class UrlDecodeProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
-	public static implicit operator Processor(UrlDecodeProcessor urlDecodeProcessor) => Ingest.Processor.Urldecode(urlDecodeProcessor);
+	public static implicit operator Processor(UrlDecodeProcessor urlDecodeProcessor) => Ingest.Processor.UrlDecode(urlDecodeProcessor);
 }
 
 public sealed partial class UrlDecodeProcessorDescriptor<TDocument> : SerializableDescriptor<UrlDecodeProcessorDescriptor<TDocument>>
 {
 	internal UrlDecodeProcessorDescriptor(Action<UrlDecodeProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public UrlDecodeProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public UrlDecodeProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -252,30 +238,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class UrlDecodeProcessorDescriptor : SerializableDescriptor<UrlDecodeProcessorDescriptor>
 {
 	internal UrlDecodeProcessorDescriptor(Action<UrlDecodeProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public UrlDecodeProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public UrlDecodeProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UserAgentProcessor.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UserAgentProcessor.g.cs
index 13f57459687..f6f1d90e932 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UserAgentProcessor.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ingest/UserAgentProcessor.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ingest;
+
 public sealed partial class UserAgentProcessor
 {
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("if")]
 	public string? If { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_missing")]
 	public bool? IgnoreMissing { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_failure")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("options")]
 	public ICollection<Elastic.Clients.Elasticsearch.Ingest.UserAgentProperty>? Options { get; set; }
-
 	[JsonInclude, JsonPropertyName("regex_file")]
 	public string? RegexFile { get; set; }
-
 	[JsonInclude, JsonPropertyName("tag")]
 	public string? Tag { get; set; }
-
 	[JsonInclude, JsonPropertyName("target_field")]
 	public Elastic.Clients.Elasticsearch.Field? TargetField { get; set; }
 
@@ -63,34 +56,23 @@ public sealed partial class UserAgentProcessor
 public sealed partial class UserAgentProcessorDescriptor<TDocument> : SerializableDescriptor<UserAgentProcessorDescriptor<TDocument>>
 {
 	internal UserAgentProcessorDescriptor(Action<UserAgentProcessorDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public UserAgentProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor<TDocument> OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor<TDocument>>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.UserAgentProperty>? OptionsValue { get; set; }
-
 	private string? RegexFileValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public UserAgentProcessorDescriptor<TDocument> OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
@@ -286,34 +268,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class UserAgentProcessorDescriptor : SerializableDescriptor<UserAgentProcessorDescriptor>
 {
 	internal UserAgentProcessorDescriptor(Action<UserAgentProcessorDescriptor> configure) => configure.Invoke(this);
+
 	public UserAgentProcessorDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? OnFailureValue { get; set; }
-
 	private ProcessorDescriptor OnFailureDescriptor { get; set; }
-
 	private Action<ProcessorDescriptor> OnFailureDescriptorAction { get; set; }
-
 	private Action<ProcessorDescriptor>[] OnFailureDescriptorActions { get; set; }
-
 	private string? DescriptionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? IfValue { get; set; }
-
 	private bool? IgnoreFailureValue { get; set; }
-
 	private bool? IgnoreMissingValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.Ingest.UserAgentProperty>? OptionsValue { get; set; }
-
 	private string? RegexFileValue { get; set; }
-
 	private string? TagValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? TargetFieldValue { get; set; }
 
 	public UserAgentProcessorDescriptor OnFailure(ICollection<Elastic.Clients.Elasticsearch.Ingest.Processor>? onFailure)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineGet.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineGet.g.cs
index 274ffa93e7a..6db7448afb9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineGet.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineGet.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,29 +25,23 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class InlineGet<TDocument>
 {
 	[JsonInclude, JsonPropertyName("_primary_term")]
 	public long? PrimaryTerm { get; init; }
-
 	[JsonInclude, JsonPropertyName("_routing")]
 	public string? Routing { get; init; }
-
 	[JsonInclude, JsonPropertyName("_seq_no")]
 	public long? SeqNo { get; init; }
-
 	[JsonInclude, JsonPropertyName("_source")]
 	[SourceConverter]
 	public TDocument Source { get; init; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public IReadOnlyDictionary<string, object>? Fields { get; init; }
-
 	[JsonInclude, JsonPropertyName("found")]
 	public bool Found { get; init; }
-
 	[JsonInclude, JsonPropertyName("metadata")]
 	public IReadOnlyDictionary<string, object> Metadata { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineScript.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineScript.g.cs
index 8152e76c390..0ddbe8872cb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineScript.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineScript.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class InlineScript
 {
 	[JsonInclude, JsonPropertyName("lang")]
 	public Elastic.Clients.Elasticsearch.ScriptLanguage? Language { get; set; }
-
 	[JsonInclude, JsonPropertyName("options")]
 	public IDictionary<string, string>? Options { get; set; }
-
 	[JsonInclude, JsonPropertyName("params")]
 	public IDictionary<string, object>? Params { get; set; }
-
 	[JsonInclude, JsonPropertyName("source")]
 	public string Source { get; set; }
 }
@@ -43,16 +42,14 @@ public sealed partial class InlineScript
 public sealed partial class InlineScriptDescriptor : SerializableDescriptor<InlineScriptDescriptor>
 {
 	internal InlineScriptDescriptor(Action<InlineScriptDescriptor> configure) => configure.Invoke(this);
+
 	public InlineScriptDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.ScriptLanguage? LanguageValue { get; set; }
-
 	private IDictionary<string, string>? OptionsValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
-
 	private string SourceValue { get; set; }
 
 	public InlineScriptDescriptor Language(Elastic.Clients.Elasticsearch.ScriptLanguage? language)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs
index bc1cc0bf931..ae7f87c88ba 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,43 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class KnnQuery
 {
+	/// <summary>
+	/// <para>Boost value to apply to kNN scores</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
+	/// <summary>
+	/// <para>The name of the vector field to search against</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
+	/// <summary>
+	/// <para>Filters for the kNN search query</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("filter"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Filter { get; set; }
 
+	/// <summary>
+	/// <para>The final number of nearest neighbors to return as top hits</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("k")]
 	public long k { get; set; }
 
+	/// <summary>
+	/// <para>The number of nearest neighbor candidates to consider per shard</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("num_candidates")]
 	public long NumCandidates { get; set; }
 
+	/// <summary>
+	/// <para>The query vector</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("query_vector")]
 	public ICollection<double> QueryVector { get; set; }
 }
@@ -49,28 +69,24 @@ public sealed partial class KnnQuery
 public sealed partial class KnnQueryDescriptor<TDocument> : SerializableDescriptor<KnnQueryDescriptor<TDocument>>
 {
 	internal KnnQueryDescriptor(Action<KnnQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public KnnQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>>[] FilterDescriptorActions { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private long kValue { get; set; }
-
 	private long NumCandidatesValue { get; set; }
-
 	private ICollection<double> QueryVectorValue { get; set; }
 
+	/// <summary>
+	/// <para>Filters for the kNN search query</para>
+	/// </summary>
 	public KnnQueryDescriptor<TDocument> Filter(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? filter)
 	{
 		FilterDescriptor = null;
@@ -107,36 +123,54 @@ public KnnQueryDescriptor<TDocument> Filter(params Action<QueryDsl.QueryDescript
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Boost value to apply to kNN scores</para>
+	/// </summary>
 	public KnnQueryDescriptor<TDocument> Boost(float? boost)
 	{
 		BoostValue = boost;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The name of the vector field to search against</para>
+	/// </summary>
 	public KnnQueryDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The name of the vector field to search against</para>
+	/// </summary>
 	public KnnQueryDescriptor<TDocument> Field<TValue>(Expression<Func<TDocument, TValue>> field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The final number of nearest neighbors to return as top hits</para>
+	/// </summary>
 	public KnnQueryDescriptor<TDocument> k(long k)
 	{
 		kValue = k;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The number of nearest neighbor candidates to consider per shard</para>
+	/// </summary>
 	public KnnQueryDescriptor<TDocument> NumCandidates(long numCandidates)
 	{
 		NumCandidatesValue = numCandidates;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The query vector</para>
+	/// </summary>
 	public KnnQueryDescriptor<TDocument> QueryVector(ICollection<double> queryVector)
 	{
 		QueryVectorValue = queryVector;
@@ -196,28 +230,24 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class KnnQueryDescriptor : SerializableDescriptor<KnnQueryDescriptor>
 {
 	internal KnnQueryDescriptor(Action<KnnQueryDescriptor> configure) => configure.Invoke(this);
+
 	public KnnQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor>[] FilterDescriptorActions { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private long kValue { get; set; }
-
 	private long NumCandidatesValue { get; set; }
-
 	private ICollection<double> QueryVectorValue { get; set; }
 
+	/// <summary>
+	/// <para>Filters for the kNN search query</para>
+	/// </summary>
 	public KnnQueryDescriptor Filter(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? filter)
 	{
 		FilterDescriptor = null;
@@ -254,42 +284,63 @@ public KnnQueryDescriptor Filter(params Action<QueryDsl.QueryDescriptor>[] confi
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Boost value to apply to kNN scores</para>
+	/// </summary>
 	public KnnQueryDescriptor Boost(float? boost)
 	{
 		BoostValue = boost;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The name of the vector field to search against</para>
+	/// </summary>
 	public KnnQueryDescriptor Field(Elastic.Clients.Elasticsearch.Field field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The name of the vector field to search against</para>
+	/// </summary>
 	public KnnQueryDescriptor Field<TDocument, TValue>(Expression<Func<TDocument, TValue>> field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The name of the vector field to search against</para>
+	/// </summary>
 	public KnnQueryDescriptor Field<TDocument>(Expression<Func<TDocument, object>> field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The final number of nearest neighbors to return as top hits</para>
+	/// </summary>
 	public KnnQueryDescriptor k(long k)
 	{
 		kValue = k;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The number of nearest neighbor candidates to consider per shard</para>
+	/// </summary>
 	public KnnQueryDescriptor NumCandidates(long numCandidates)
 	{
 		NumCandidatesValue = numCandidates;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The query vector</para>
+	/// </summary>
 	public KnnQueryDescriptor QueryVector(ICollection<double> queryVector)
 	{
 		QueryVectorValue = queryVector;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/LatLonGeoLocation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/LatLonGeoLocation.g.cs
index 497f1797f00..8b68aa1add8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/LatLonGeoLocation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/LatLonGeoLocation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class LatLonGeoLocation
 {
 	[JsonInclude, JsonPropertyName("lat")]
 	public double Lat { get; set; }
-
 	[JsonInclude, JsonPropertyName("lon")]
 	public double Lon { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class LatLonGeoLocation
 public sealed partial class LatLonGeoLocationDescriptor : SerializableDescriptor<LatLonGeoLocationDescriptor>
 {
 	internal LatLonGeoLocationDescriptor(Action<LatLonGeoLocationDescriptor> configure) => configure.Invoke(this);
+
 	public LatLonGeoLocationDescriptor() : base()
 	{
 	}
 
 	private double LatValue { get; set; }
-
 	private double LonValue { get; set; }
 
 	public LatLonGeoLocationDescriptor Lat(double lat)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/AggregateMetricDoubleProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/AggregateMetricDoubleProperty.g.cs
index 999729c82ff..a1a62c3d238 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/AggregateMetricDoubleProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/AggregateMetricDoubleProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,60 +25,46 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class AggregateMetricDoubleProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("default_metric")]
 	public string DefaultMetric { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("metrics")]
 	public ICollection<string> Metrics { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "aggregate_metric_double";
 }
 
 public sealed partial class AggregateMetricDoublePropertyDescriptor<TDocument> : SerializableDescriptor<AggregateMetricDoublePropertyDescriptor<TDocument>>, IBuildableDescriptor<AggregateMetricDoubleProperty>
 {
 	internal AggregateMetricDoublePropertyDescriptor(Action<AggregateMetricDoublePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public AggregateMetricDoublePropertyDescriptor() : base()
 	{
 	}
 
 	private string DefaultMetricValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private ICollection<string> MetricsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public AggregateMetricDoublePropertyDescriptor<TDocument> DefaultMetric(string defaultMetric)
@@ -219,24 +207,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class AggregateMetricDoublePropertyDescriptor : SerializableDescriptor<AggregateMetricDoublePropertyDescriptor>, IBuildableDescriptor<AggregateMetricDoubleProperty>
 {
 	internal AggregateMetricDoublePropertyDescriptor(Action<AggregateMetricDoublePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public AggregateMetricDoublePropertyDescriptor() : base()
 	{
 	}
 
 	private string DefaultMetricValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private ICollection<string> MetricsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public AggregateMetricDoublePropertyDescriptor DefaultMetric(string defaultMetric)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/AllField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/AllField.g.cs
index b209e43b8a3..82fcb7b2366 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/AllField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/AllField.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,37 +25,28 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class AllField
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("enabled")]
 	public bool Enabled { get; set; }
-
 	[JsonInclude, JsonPropertyName("omit_norms")]
 	public bool OmitNorms { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_analyzer")]
 	public string SearchAnalyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("store_term_vector_offsets")]
 	public bool StoreTermVectorOffsets { get; set; }
-
 	[JsonInclude, JsonPropertyName("store_term_vector_payloads")]
 	public bool StoreTermVectorPayloads { get; set; }
-
 	[JsonInclude, JsonPropertyName("store_term_vector_positions")]
 	public bool StoreTermVectorPositions { get; set; }
-
 	[JsonInclude, JsonPropertyName("store_term_vectors")]
 	public bool StoreTermVectors { get; set; }
 }
@@ -61,28 +54,20 @@ public sealed partial class AllField
 public sealed partial class AllFieldDescriptor : SerializableDescriptor<AllFieldDescriptor>
 {
 	internal AllFieldDescriptor(Action<AllFieldDescriptor> configure) => configure.Invoke(this);
+
 	public AllFieldDescriptor() : base()
 	{
 	}
 
 	private string AnalyzerValue { get; set; }
-
 	private bool EnabledValue { get; set; }
-
 	private bool OmitNormsValue { get; set; }
-
 	private string SearchAnalyzerValue { get; set; }
-
 	private string SimilarityValue { get; set; }
-
 	private bool StoreValue { get; set; }
-
 	private bool StoreTermVectorOffsetsValue { get; set; }
-
 	private bool StoreTermVectorPayloadsValue { get; set; }
-
 	private bool StoreTermVectorPositionsValue { get; set; }
-
 	private bool StoreTermVectorsValue { get; set; }
 
 	public AllFieldDescriptor Analyzer(string analyzer)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BinaryProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BinaryProperty.g.cs
index b1d641a267c..d45da411bd2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BinaryProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BinaryProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,65 +25,49 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class BinaryProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "binary";
 }
 
 public sealed partial class BinaryPropertyDescriptor<TDocument> : SerializableDescriptor<BinaryPropertyDescriptor<TDocument>>, IBuildableDescriptor<BinaryProperty>
 {
 	internal BinaryPropertyDescriptor(Action<BinaryPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public BinaryPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public BinaryPropertyDescriptor<TDocument> CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
@@ -245,26 +231,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class BinaryPropertyDescriptor : SerializableDescriptor<BinaryPropertyDescriptor>, IBuildableDescriptor<BinaryProperty>
 {
 	internal BinaryPropertyDescriptor(Action<BinaryPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public BinaryPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public BinaryPropertyDescriptor CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BooleanProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BooleanProperty.g.cs
index f12cc44c61f..fdda199c786 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BooleanProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/BooleanProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,89 +25,63 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class BooleanProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fielddata")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.NumericFielddata? Fielddata { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public bool? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "boolean";
 }
 
 public sealed partial class BooleanPropertyDescriptor<TDocument> : SerializableDescriptor<BooleanPropertyDescriptor<TDocument>>, IBuildableDescriptor<BooleanProperty>
 {
 	internal BooleanPropertyDescriptor(Action<BooleanPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public BooleanPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.NumericFielddata? FielddataValue { get; set; }
-
 	private IndexManagement.NumericFielddataDescriptor FielddataDescriptor { get; set; }
-
 	private Action<IndexManagement.NumericFielddataDescriptor> FielddataDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public BooleanPropertyDescriptor<TDocument> Boost(double? boost)
@@ -373,38 +349,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class BooleanPropertyDescriptor : SerializableDescriptor<BooleanPropertyDescriptor>, IBuildableDescriptor<BooleanProperty>
 {
 	internal BooleanPropertyDescriptor(Action<BooleanPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public BooleanPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.NumericFielddata? FielddataValue { get; set; }
-
 	private IndexManagement.NumericFielddataDescriptor FielddataDescriptor { get; set; }
-
 	private Action<IndexManagement.NumericFielddataDescriptor> FielddataDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public BooleanPropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ByteNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ByteNumberProperty.g.cs
index 26341a03532..232f7e65b67 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ByteNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ByteNumberProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,110 +25,76 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class ByteNumberProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public double? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptError { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "byte";
 }
 
 public sealed partial class ByteNumberPropertyDescriptor<TDocument> : SerializableDescriptor<ByteNumberPropertyDescriptor<TDocument>>, IBuildableDescriptor<ByteNumberProperty>
 {
 	internal ByteNumberPropertyDescriptor(Action<ByteNumberPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ByteNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private double? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public ByteNumberPropertyDescriptor<TDocument> Boost(double? boost)
@@ -407,44 +375,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ByteNumberPropertyDescriptor : SerializableDescriptor<ByteNumberPropertyDescriptor>, IBuildableDescriptor<ByteNumberProperty>
 {
 	internal ByteNumberPropertyDescriptor(Action<ByteNumberPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public ByteNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private double? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public ByteNumberPropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/CompletionProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/CompletionProperty.g.cs
index 81c4cd80da1..e386924e7e5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/CompletionProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/CompletionProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,101 +25,70 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class CompletionProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("contexts")]
 	public ICollection<Elastic.Clients.Elasticsearch.Mapping.SuggestContext>? Contexts { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_input_length")]
 	public int? MaxInputLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("preserve_position_increments")]
 	public bool? PreservePositionIncrements { get; set; }
-
 	[JsonInclude, JsonPropertyName("preserve_separators")]
 	public bool? PreserveSeparators { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_analyzer")]
 	public string? SearchAnalyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "completion";
 }
 
 public sealed partial class CompletionPropertyDescriptor<TDocument> : SerializableDescriptor<CompletionPropertyDescriptor<TDocument>>, IBuildableDescriptor<CompletionProperty>
 {
 	internal CompletionPropertyDescriptor(Action<CompletionPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CompletionPropertyDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Mapping.SuggestContext>? ContextsValue { get; set; }
-
 	private SuggestContextDescriptor<TDocument> ContextsDescriptor { get; set; }
-
 	private Action<SuggestContextDescriptor<TDocument>> ContextsDescriptorAction { get; set; }
-
 	private Action<SuggestContextDescriptor<TDocument>>[] ContextsDescriptorActions { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private int? MaxInputLengthValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? PreservePositionIncrementsValue { get; set; }
-
 	private bool? PreserveSeparatorsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SearchAnalyzerValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public CompletionPropertyDescriptor<TDocument> Contexts(ICollection<Elastic.Clients.Elasticsearch.Mapping.SuggestContext>? contexts)
@@ -414,44 +385,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class CompletionPropertyDescriptor : SerializableDescriptor<CompletionPropertyDescriptor>, IBuildableDescriptor<CompletionProperty>
 {
 	internal CompletionPropertyDescriptor(Action<CompletionPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public CompletionPropertyDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.Mapping.SuggestContext>? ContextsValue { get; set; }
-
 	private SuggestContextDescriptor ContextsDescriptor { get; set; }
-
 	private Action<SuggestContextDescriptor> ContextsDescriptorAction { get; set; }
-
 	private Action<SuggestContextDescriptor>[] ContextsDescriptorActions { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private int? MaxInputLengthValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? PreservePositionIncrementsValue { get; set; }
-
 	private bool? PreserveSeparatorsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SearchAnalyzerValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public CompletionPropertyDescriptor Contexts(ICollection<Elastic.Clients.Elasticsearch.Mapping.SuggestContext>? contexts)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ConstantKeywordProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ConstantKeywordProperty.g.cs
index 3208e3f6783..cb61b6154bf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ConstantKeywordProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ConstantKeywordProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class ConstantKeywordProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "constant_keyword";
+
 	[JsonInclude, JsonPropertyName("value")]
 	public object? Value { get; set; }
 }
@@ -52,20 +50,16 @@ public sealed partial class ConstantKeywordProperty : IProperty
 public sealed partial class ConstantKeywordPropertyDescriptor<TDocument> : SerializableDescriptor<ConstantKeywordPropertyDescriptor<TDocument>>, IBuildableDescriptor<ConstantKeywordProperty>
 {
 	internal ConstantKeywordPropertyDescriptor(Action<ConstantKeywordPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ConstantKeywordPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private object? ValueValue { get; set; }
 
 	public ConstantKeywordPropertyDescriptor<TDocument> Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
@@ -190,20 +184,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ConstantKeywordPropertyDescriptor : SerializableDescriptor<ConstantKeywordPropertyDescriptor>, IBuildableDescriptor<ConstantKeywordProperty>
 {
 	internal ConstantKeywordPropertyDescriptor(Action<ConstantKeywordPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public ConstantKeywordPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private object? ValueValue { get; set; }
 
 	public ConstantKeywordPropertyDescriptor Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DataStreamTimestamp.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DataStreamTimestamp.g.cs
index 50a4a45c874..1849c20d24d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DataStreamTimestamp.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DataStreamTimestamp.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class DataStreamTimestamp
 {
 	[JsonInclude, JsonPropertyName("enabled")]
@@ -34,6 +36,7 @@ public sealed partial class DataStreamTimestamp
 public sealed partial class DataStreamTimestampDescriptor : SerializableDescriptor<DataStreamTimestampDescriptor>
 {
 	internal DataStreamTimestampDescriptor(Action<DataStreamTimestampDescriptor> configure) => configure.Invoke(this);
+
 	public DataStreamTimestampDescriptor() : base()
 	{
 	}
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 a1278409db0..1cef6a9de3f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateNanosProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateNanosProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,95 +25,67 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class DateNanosProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public DateTimeOffset? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("precision_step")]
 	public int? PrecisionStep { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "date_nanos";
 }
 
 public sealed partial class DateNanosPropertyDescriptor<TDocument> : SerializableDescriptor<DateNanosPropertyDescriptor<TDocument>>, IBuildableDescriptor<DateNanosProperty>
 {
 	internal DateNanosPropertyDescriptor(Action<DateNanosPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DateNanosPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private DateTimeOffset? NullValueValue { get; set; }
-
 	private int? PrecisionStepValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public DateNanosPropertyDescriptor<TDocument> Boost(double? boost)
@@ -353,38 +327,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DateNanosPropertyDescriptor : SerializableDescriptor<DateNanosPropertyDescriptor>, IBuildableDescriptor<DateNanosProperty>
 {
 	internal DateNanosPropertyDescriptor(Action<DateNanosPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public DateNanosPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private DateTimeOffset? NullValueValue { get; set; }
-
 	private int? PrecisionStepValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public DateNanosPropertyDescriptor Boost(double? boost)
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 f3af14f6834..9346111c4bd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,109 +25,75 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class DateProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fielddata")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.NumericFielddata? Fielddata { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("locale")]
 	public string? Locale { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public DateTimeOffset? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("precision_step")]
 	public int? PrecisionStep { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "date";
 }
 
 public sealed partial class DatePropertyDescriptor<TDocument> : SerializableDescriptor<DatePropertyDescriptor<TDocument>>, IBuildableDescriptor<DateProperty>
 {
 	internal DatePropertyDescriptor(Action<DatePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DatePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.NumericFielddata? FielddataValue { get; set; }
-
 	private IndexManagement.NumericFielddataDescriptor FielddataDescriptor { get; set; }
-
 	private Action<IndexManagement.NumericFielddataDescriptor> FielddataDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private string? LocaleValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private DateTimeOffset? NullValueValue { get; set; }
-
 	private int? PrecisionStepValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public DatePropertyDescriptor<TDocument> Boost(double? boost)
@@ -445,46 +413,29 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DatePropertyDescriptor : SerializableDescriptor<DatePropertyDescriptor>, IBuildableDescriptor<DateProperty>
 {
 	internal DatePropertyDescriptor(Action<DatePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public DatePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.NumericFielddata? FielddataValue { get; set; }
-
 	private IndexManagement.NumericFielddataDescriptor FielddataDescriptor { get; set; }
-
 	private Action<IndexManagement.NumericFielddataDescriptor> FielddataDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private string? LocaleValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private DateTimeOffset? NullValueValue { get; set; }
-
 	private int? PrecisionStepValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public DatePropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateRangeProperty.g.cs
index 5f65ecc9b24..7a91fa419fb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DateRangeProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,85 +25,61 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class DateRangeProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "date_range";
 }
 
 public sealed partial class DateRangePropertyDescriptor<TDocument> : SerializableDescriptor<DateRangePropertyDescriptor<TDocument>>, IBuildableDescriptor<DateRangeProperty>
 {
 	internal DateRangePropertyDescriptor(Action<DateRangePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DateRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public DateRangePropertyDescriptor<TDocument> Boost(double? boost)
@@ -317,34 +295,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DateRangePropertyDescriptor : SerializableDescriptor<DateRangePropertyDescriptor>, IBuildableDescriptor<DateRangeProperty>
 {
 	internal DateRangePropertyDescriptor(Action<DateRangePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public DateRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public DateRangePropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DenseVectorIndexOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DenseVectorIndexOptions.g.cs
index 1909035ee96..7b8ad51d17b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DenseVectorIndexOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DenseVectorIndexOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class DenseVectorIndexOptions
 {
 	[JsonInclude, JsonPropertyName("ef_construction")]
 	public int EfConstruction { get; set; }
-
 	[JsonInclude, JsonPropertyName("m")]
 	public int m { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class DenseVectorIndexOptions
 public sealed partial class DenseVectorIndexOptionsDescriptor : SerializableDescriptor<DenseVectorIndexOptionsDescriptor>, IBuildableDescriptor<DenseVectorIndexOptions>
 {
 	internal DenseVectorIndexOptionsDescriptor(Action<DenseVectorIndexOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public DenseVectorIndexOptionsDescriptor() : base()
 	{
 	}
 
 	private int EfConstructionValue { get; set; }
-
 	private int mValue { get; set; }
-
 	private string TypeValue { get; set; }
 
 	public DenseVectorIndexOptionsDescriptor EfConstruction(int efConstruction)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DenseVectorProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DenseVectorProperty.g.cs
index 9ca6c163fa9..124a8459584 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DenseVectorProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DenseVectorProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,69 +25,51 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class DenseVectorProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("dims")]
 	public int Dims { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_options")]
 	public Elastic.Clients.Elasticsearch.Mapping.DenseVectorIndexOptions? IndexOptions { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "dense_vector";
 }
 
 public sealed partial class DenseVectorPropertyDescriptor<TDocument> : SerializableDescriptor<DenseVectorPropertyDescriptor<TDocument>>, IBuildableDescriptor<DenseVectorProperty>
 {
 	internal DenseVectorPropertyDescriptor(Action<DenseVectorPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DenseVectorPropertyDescriptor() : base()
 	{
 	}
 
 	private int DimsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DenseVectorIndexOptions? IndexOptionsValue { get; set; }
-
 	private DenseVectorIndexOptionsDescriptor IndexOptionsDescriptor { get; set; }
-
 	private Action<DenseVectorIndexOptionsDescriptor> IndexOptionsDescriptorAction { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
 
 	public DenseVectorPropertyDescriptor<TDocument> Dims(int dims)
@@ -297,30 +281,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DenseVectorPropertyDescriptor : SerializableDescriptor<DenseVectorPropertyDescriptor>, IBuildableDescriptor<DenseVectorProperty>
 {
 	internal DenseVectorPropertyDescriptor(Action<DenseVectorPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public DenseVectorPropertyDescriptor() : base()
 	{
 	}
 
 	private int DimsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DenseVectorIndexOptions? IndexOptionsValue { get; set; }
-
 	private DenseVectorIndexOptionsDescriptor IndexOptionsDescriptor { get; set; }
-
 	private Action<DenseVectorIndexOptionsDescriptor> IndexOptionsDescriptorAction { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
 
 	public DenseVectorPropertyDescriptor Dims(int dims)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleNumberProperty.g.cs
index e1ead45c9a4..ec38d75c9be 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleNumberProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,110 +25,76 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class DoubleNumberProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public double? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptError { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "double";
 }
 
 public sealed partial class DoubleNumberPropertyDescriptor<TDocument> : SerializableDescriptor<DoubleNumberPropertyDescriptor<TDocument>>, IBuildableDescriptor<DoubleNumberProperty>
 {
 	internal DoubleNumberPropertyDescriptor(Action<DoubleNumberPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DoubleNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private double? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public DoubleNumberPropertyDescriptor<TDocument> Boost(double? boost)
@@ -407,44 +375,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DoubleNumberPropertyDescriptor : SerializableDescriptor<DoubleNumberPropertyDescriptor>, IBuildableDescriptor<DoubleNumberProperty>
 {
 	internal DoubleNumberPropertyDescriptor(Action<DoubleNumberPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public DoubleNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private double? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public DoubleNumberPropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleRangeProperty.g.cs
index 1701a159a53..d4df3d93abc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DoubleRangeProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,80 +25,58 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class DoubleRangeProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "double_range";
 }
 
 public sealed partial class DoubleRangePropertyDescriptor<TDocument> : SerializableDescriptor<DoubleRangePropertyDescriptor<TDocument>>, IBuildableDescriptor<DoubleRangeProperty>
 {
 	internal DoubleRangePropertyDescriptor(Action<DoubleRangePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DoubleRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public DoubleRangePropertyDescriptor<TDocument> Boost(double? boost)
@@ -299,32 +279,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DoubleRangePropertyDescriptor : SerializableDescriptor<DoubleRangePropertyDescriptor>, IBuildableDescriptor<DoubleRangeProperty>
 {
 	internal DoubleRangePropertyDescriptor(Action<DoubleRangePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public DoubleRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public DoubleRangePropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicProperty.g.cs
index 357d3492656..918f556ed88 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,179 +25,117 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class DynamicProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("eager_global_ordinals")]
 	public bool? EagerGlobalOrdinals { get; set; }
-
 	[JsonInclude, JsonPropertyName("enabled")]
 	public bool? Enabled { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_options")]
 	public Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptions { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_phrases")]
 	public bool? IndexPhrases { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_prefixes")]
 	public Elastic.Clients.Elasticsearch.Mapping.TextIndexPrefixes? IndexPrefixes { get; set; }
-
 	[JsonInclude, JsonPropertyName("locale")]
 	public string? Locale { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("norms")]
 	public bool? Norms { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public Elastic.Clients.Elasticsearch.FieldValue? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptError { get; set; }
-
 	[JsonInclude, JsonPropertyName("position_increment_gap")]
 	public int? PositionIncrementGap { get; set; }
-
 	[JsonInclude, JsonPropertyName("precision_step")]
 	public int? PrecisionStep { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_analyzer")]
 	public string? SearchAnalyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_quote_analyzer")]
 	public string? SearchQuoteAnalyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("term_vector")]
 	public Elastic.Clients.Elasticsearch.Mapping.TermVectorOption? TermVector { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "{dynamic_property}";
 }
 
 public sealed partial class DynamicPropertyDescriptor<TDocument> : SerializableDescriptor<DynamicPropertyDescriptor<TDocument>>, IBuildableDescriptor<DynamicProperty>
 {
 	internal DynamicPropertyDescriptor(Action<DynamicPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DynamicPropertyDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EagerGlobalOrdinalsValue { get; set; }
-
 	private bool? EnabledValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptionsValue { get; set; }
-
 	private bool? IndexPhrasesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TextIndexPrefixes? IndexPrefixesValue { get; set; }
-
 	private TextIndexPrefixesDescriptor IndexPrefixesDescriptor { get; set; }
-
 	private Action<TextIndexPrefixesDescriptor> IndexPrefixesDescriptorAction { get; set; }
-
 	private string? LocaleValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? NormsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.FieldValue? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private int? PositionIncrementGapValue { get; set; }
-
 	private int? PrecisionStepValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SearchAnalyzerValue { get; set; }
-
 	private string? SearchQuoteAnalyzerValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TermVectorOption? TermVectorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public DynamicPropertyDescriptor<TDocument> Analyzer(string? analyzer)
@@ -697,74 +637,43 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DynamicPropertyDescriptor : SerializableDescriptor<DynamicPropertyDescriptor>, IBuildableDescriptor<DynamicProperty>
 {
 	internal DynamicPropertyDescriptor(Action<DynamicPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public DynamicPropertyDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EagerGlobalOrdinalsValue { get; set; }
-
 	private bool? EnabledValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptionsValue { get; set; }
-
 	private bool? IndexPhrasesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TextIndexPrefixes? IndexPrefixesValue { get; set; }
-
 	private TextIndexPrefixesDescriptor IndexPrefixesDescriptor { get; set; }
-
 	private Action<TextIndexPrefixesDescriptor> IndexPrefixesDescriptorAction { get; set; }
-
 	private string? LocaleValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? NormsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.FieldValue? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private int? PositionIncrementGapValue { get; set; }
-
 	private int? PrecisionStepValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SearchAnalyzerValue { get; set; }
-
 	private string? SearchQuoteAnalyzerValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TermVectorOption? TermVectorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public DynamicPropertyDescriptor Analyzer(string? analyzer)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicTemplate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicTemplate.g.cs
index 84b93dca72e..f603c73e42c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicTemplate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/DynamicTemplate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class DynamicTemplate
 {
 	[JsonInclude, JsonPropertyName("mapping")]
 	public Elastic.Clients.Elasticsearch.Mapping.IProperty? Mapping { get; set; }
-
 	[JsonInclude, JsonPropertyName("match")]
 	public string? Match { get; set; }
-
 	[JsonInclude, JsonPropertyName("match_mapping_type")]
 	public string? MatchMappingType { get; set; }
-
 	[JsonInclude, JsonPropertyName("match_pattern")]
 	public Elastic.Clients.Elasticsearch.Mapping.MatchType? MatchPattern { get; set; }
-
 	[JsonInclude, JsonPropertyName("path_match")]
 	public string? PathMatch { get; set; }
-
 	[JsonInclude, JsonPropertyName("path_unmatch")]
 	public string? PathUnmatch { get; set; }
-
 	[JsonInclude, JsonPropertyName("unmatch")]
 	public string? Unmatch { get; set; }
 }
@@ -52,22 +48,17 @@ public sealed partial class DynamicTemplate
 public sealed partial class DynamicTemplateDescriptor : SerializableDescriptor<DynamicTemplateDescriptor>
 {
 	internal DynamicTemplateDescriptor(Action<DynamicTemplateDescriptor> configure) => configure.Invoke(this);
+
 	public DynamicTemplateDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.IProperty? MappingValue { get; set; }
-
 	private string? MatchValue { get; set; }
-
 	private string? MatchMappingTypeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.MatchType? MatchPatternValue { get; set; }
-
 	private string? PathMatchValue { get; set; }
-
 	private string? PathUnmatchValue { get; set; }
-
 	private string? UnmatchValue { get; set; }
 
 	public DynamicTemplateDescriptor Mapping(Elastic.Clients.Elasticsearch.Mapping.IProperty? mapping)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldAliasProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldAliasProperty.g.cs
index 0d1fef75f26..efd04b0f67a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldAliasProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldAliasProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,50 +25,40 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class FieldAliasProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("path")]
 	public Elastic.Clients.Elasticsearch.Field? Path { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "alias";
 }
 
 public sealed partial class FieldAliasPropertyDescriptor<TDocument> : SerializableDescriptor<FieldAliasPropertyDescriptor<TDocument>>, IBuildableDescriptor<FieldAliasProperty>
 {
 	internal FieldAliasPropertyDescriptor(Action<FieldAliasPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FieldAliasPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? PathValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
 
 	public FieldAliasPropertyDescriptor<TDocument> Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
@@ -197,20 +189,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FieldAliasPropertyDescriptor : SerializableDescriptor<FieldAliasPropertyDescriptor>, IBuildableDescriptor<FieldAliasProperty>
 {
 	internal FieldAliasPropertyDescriptor(Action<FieldAliasPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public FieldAliasPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? PathValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
 
 	public FieldAliasPropertyDescriptor Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldMapping.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldMapping.g.cs
index 6baa270a563..da7f8c1938c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldMapping.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldMapping.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class FieldMapping
 {
 	[JsonInclude, JsonPropertyName("full_name")]
 	public string FullName { get; init; }
-
 	[JsonInclude, JsonPropertyName("mapping")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties Mapping { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldNamesField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldNamesField.g.cs
index fbd579105bb..16074d6d703 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldNamesField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FieldNamesField.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class FieldNamesField
 {
 	[JsonInclude, JsonPropertyName("enabled")]
@@ -34,6 +36,7 @@ public sealed partial class FieldNamesField
 public sealed partial class FieldNamesFieldDescriptor : SerializableDescriptor<FieldNamesFieldDescriptor>
 {
 	internal FieldNamesFieldDescriptor(Action<FieldNamesFieldDescriptor> configure) => configure.Invoke(this);
+
 	public FieldNamesFieldDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FlattenedProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FlattenedProperty.g.cs
index dbf3fa74457..167fc532d7f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FlattenedProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FlattenedProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,90 +25,64 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class FlattenedProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("depth_limit")]
 	public int? DepthLimit { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("eager_global_ordinals")]
 	public bool? EagerGlobalOrdinals { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_options")]
 	public Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptions { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public string? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("split_queries_on_whitespace")]
 	public bool? SplitQueriesOnWhitespace { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "flattened";
 }
 
 public sealed partial class FlattenedPropertyDescriptor<TDocument> : SerializableDescriptor<FlattenedPropertyDescriptor<TDocument>>, IBuildableDescriptor<FlattenedProperty>
 {
 	internal FlattenedPropertyDescriptor(Action<FlattenedPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FlattenedPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private int? DepthLimitValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EagerGlobalOrdinalsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptionsValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private string? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? SplitQueriesOnWhitespaceValue { get; set; }
 
 	public FlattenedPropertyDescriptor<TDocument> Boost(double? boost)
@@ -335,36 +311,24 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FlattenedPropertyDescriptor : SerializableDescriptor<FlattenedPropertyDescriptor>, IBuildableDescriptor<FlattenedProperty>
 {
 	internal FlattenedPropertyDescriptor(Action<FlattenedPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public FlattenedPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private int? DepthLimitValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EagerGlobalOrdinalsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptionsValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private string? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? SplitQueriesOnWhitespaceValue { get; set; }
 
 	public FlattenedPropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatNumberProperty.g.cs
index 38d992c8a7a..fd4dd61f155 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatNumberProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,110 +25,76 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class FloatNumberProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public float? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptError { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "float";
 }
 
 public sealed partial class FloatNumberPropertyDescriptor<TDocument> : SerializableDescriptor<FloatNumberPropertyDescriptor<TDocument>>, IBuildableDescriptor<FloatNumberProperty>
 {
 	internal FloatNumberPropertyDescriptor(Action<FloatNumberPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FloatNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private float? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public FloatNumberPropertyDescriptor<TDocument> Boost(double? boost)
@@ -407,44 +375,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FloatNumberPropertyDescriptor : SerializableDescriptor<FloatNumberPropertyDescriptor>, IBuildableDescriptor<FloatNumberProperty>
 {
 	internal FloatNumberPropertyDescriptor(Action<FloatNumberPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public FloatNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private float? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public FloatNumberPropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatRangeProperty.g.cs
index c96c5c04c17..1f322a052dc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/FloatRangeProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,80 +25,58 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class FloatRangeProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "float_range";
 }
 
 public sealed partial class FloatRangePropertyDescriptor<TDocument> : SerializableDescriptor<FloatRangePropertyDescriptor<TDocument>>, IBuildableDescriptor<FloatRangeProperty>
 {
 	internal FloatRangePropertyDescriptor(Action<FloatRangePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FloatRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public FloatRangePropertyDescriptor<TDocument> Boost(double? boost)
@@ -299,32 +279,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FloatRangePropertyDescriptor : SerializableDescriptor<FloatRangePropertyDescriptor>, IBuildableDescriptor<FloatRangeProperty>
 {
 	internal FloatRangePropertyDescriptor(Action<FloatRangePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public FloatRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public FloatRangePropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoPointProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoPointProperty.g.cs
index 9556a9b093d..954a386a8ed 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoPointProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoPointProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,80 +25,58 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class GeoPointProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_z_value")]
 	public bool? IgnoreZValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public Elastic.Clients.Elasticsearch.GeoLocation? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "geo_point";
 }
 
 public sealed partial class GeoPointPropertyDescriptor<TDocument> : SerializableDescriptor<GeoPointPropertyDescriptor<TDocument>>, IBuildableDescriptor<GeoPointProperty>
 {
 	internal GeoPointPropertyDescriptor(Action<GeoPointPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GeoPointPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IgnoreZValueValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoLocation? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public GeoPointPropertyDescriptor<TDocument> CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
@@ -299,32 +279,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class GeoPointPropertyDescriptor : SerializableDescriptor<GeoPointPropertyDescriptor>, IBuildableDescriptor<GeoPointProperty>
 {
 	internal GeoPointPropertyDescriptor(Action<GeoPointPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public GeoPointPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IgnoreZValueValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoLocation? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public GeoPointPropertyDescriptor CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoShapeProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoShapeProperty.g.cs
index 88647660b9e..4648d609962 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoShapeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/GeoShapeProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,90 +25,70 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
+/// <summary>
+/// <para>The `geo_shape` data type facilitates the indexing of and searching with arbitrary geo shapes such as rectangles<br/>and polygons.</para>
+/// </summary>
 public sealed partial class GeoShapeProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_z_value")]
 	public bool? IgnoreZValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("orientation")]
 	public Elastic.Clients.Elasticsearch.Mapping.GeoOrientation? Orientation { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("strategy")]
 	public Elastic.Clients.Elasticsearch.Mapping.GeoStrategy? Strategy { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "geo_shape";
 }
 
+/// <summary>
+/// <para>The `geo_shape` data type facilitates the indexing of and searching with arbitrary geo shapes such as rectangles<br/>and polygons.</para>
+/// </summary>
 public sealed partial class GeoShapePropertyDescriptor<TDocument> : SerializableDescriptor<GeoShapePropertyDescriptor<TDocument>>, IBuildableDescriptor<GeoShapeProperty>
 {
 	internal GeoShapePropertyDescriptor(Action<GeoShapePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GeoShapePropertyDescriptor() : base()
 	{
 	}
 
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IgnoreZValueValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.GeoOrientation? OrientationValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.GeoStrategy? StrategyValue { get; set; }
 
 	public GeoShapePropertyDescriptor<TDocument> Coerce(bool? coerce = true)
@@ -332,39 +314,30 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	};
 }
 
+/// <summary>
+/// <para>The `geo_shape` data type facilitates the indexing of and searching with arbitrary geo shapes such as rectangles<br/>and polygons.</para>
+/// </summary>
 public sealed partial class GeoShapePropertyDescriptor : SerializableDescriptor<GeoShapePropertyDescriptor>, IBuildableDescriptor<GeoShapeProperty>
 {
 	internal GeoShapePropertyDescriptor(Action<GeoShapePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public GeoShapePropertyDescriptor() : base()
 	{
 	}
 
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IgnoreZValueValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.GeoOrientation? OrientationValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.GeoStrategy? StrategyValue { get; set; }
 
 	public GeoShapePropertyDescriptor Coerce(bool? coerce = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/HalfFloatNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/HalfFloatNumberProperty.g.cs
index f421ae611a1..e1b34072be2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/HalfFloatNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/HalfFloatNumberProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,110 +25,76 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class HalfFloatNumberProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public float? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptError { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "half_float";
 }
 
 public sealed partial class HalfFloatNumberPropertyDescriptor<TDocument> : SerializableDescriptor<HalfFloatNumberPropertyDescriptor<TDocument>>, IBuildableDescriptor<HalfFloatNumberProperty>
 {
 	internal HalfFloatNumberPropertyDescriptor(Action<HalfFloatNumberPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public HalfFloatNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private float? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public HalfFloatNumberPropertyDescriptor<TDocument> Boost(double? boost)
@@ -407,44 +375,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class HalfFloatNumberPropertyDescriptor : SerializableDescriptor<HalfFloatNumberPropertyDescriptor>, IBuildableDescriptor<HalfFloatNumberProperty>
 {
 	internal HalfFloatNumberPropertyDescriptor(Action<HalfFloatNumberPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public HalfFloatNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private float? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public HalfFloatNumberPropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/HistogramProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/HistogramProperty.g.cs
index 01724cb77ee..cd19a5ef476 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/HistogramProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/HistogramProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,50 +25,40 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class HistogramProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "histogram";
 }
 
 public sealed partial class HistogramPropertyDescriptor<TDocument> : SerializableDescriptor<HistogramPropertyDescriptor<TDocument>>, IBuildableDescriptor<HistogramProperty>
 {
 	internal HistogramPropertyDescriptor(Action<HistogramPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public HistogramPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
 
 	public HistogramPropertyDescriptor<TDocument> Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
@@ -191,20 +183,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class HistogramPropertyDescriptor : SerializableDescriptor<HistogramPropertyDescriptor>, IBuildableDescriptor<HistogramProperty>
 {
 	internal HistogramPropertyDescriptor(Action<HistogramPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public HistogramPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
 
 	public HistogramPropertyDescriptor Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IndexField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IndexField.g.cs
index a4284ce5e1f..54cb017efe2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IndexField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IndexField.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class IndexField
 {
 	[JsonInclude, JsonPropertyName("enabled")]
@@ -34,6 +36,7 @@ public sealed partial class IndexField
 public sealed partial class IndexFieldDescriptor : SerializableDescriptor<IndexFieldDescriptor>
 {
 	internal IndexFieldDescriptor(Action<IndexFieldDescriptor> configure) => configure.Invoke(this);
+
 	public IndexFieldDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerNumberProperty.g.cs
index 6dfafebbf45..db96d935b69 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerNumberProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,110 +25,76 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class IntegerNumberProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public int? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptError { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "integer";
 }
 
 public sealed partial class IntegerNumberPropertyDescriptor<TDocument> : SerializableDescriptor<IntegerNumberPropertyDescriptor<TDocument>>, IBuildableDescriptor<IntegerNumberProperty>
 {
 	internal IntegerNumberPropertyDescriptor(Action<IntegerNumberPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IntegerNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private int? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public IntegerNumberPropertyDescriptor<TDocument> Boost(double? boost)
@@ -407,44 +375,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IntegerNumberPropertyDescriptor : SerializableDescriptor<IntegerNumberPropertyDescriptor>, IBuildableDescriptor<IntegerNumberProperty>
 {
 	internal IntegerNumberPropertyDescriptor(Action<IntegerNumberPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public IntegerNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private int? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public IntegerNumberPropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerRangeProperty.g.cs
index 8399482a142..300d79230bc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IntegerRangeProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,80 +25,58 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class IntegerRangeProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "integer_range";
 }
 
 public sealed partial class IntegerRangePropertyDescriptor<TDocument> : SerializableDescriptor<IntegerRangePropertyDescriptor<TDocument>>, IBuildableDescriptor<IntegerRangeProperty>
 {
 	internal IntegerRangePropertyDescriptor(Action<IntegerRangePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IntegerRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public IntegerRangePropertyDescriptor<TDocument> Boost(double? boost)
@@ -299,32 +279,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IntegerRangePropertyDescriptor : SerializableDescriptor<IntegerRangePropertyDescriptor>, IBuildableDescriptor<IntegerRangeProperty>
 {
 	internal IntegerRangePropertyDescriptor(Action<IntegerRangePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public IntegerRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public IntegerRangePropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpProperty.g.cs
index 06a903fbefe..c959e00e23c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,100 +25,74 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class IpProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public string? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptError { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
+	/// <summary>
+	/// <para>For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "ip";
 }
 
 public sealed partial class IpPropertyDescriptor<TDocument> : SerializableDescriptor<IpPropertyDescriptor<TDocument>>, IBuildableDescriptor<IpProperty>
 {
 	internal IpPropertyDescriptor(Action<IpPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IpPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private string? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
 
 	public IpPropertyDescriptor<TDocument> Boost(double? boost)
@@ -237,6 +213,9 @@ public IpPropertyDescriptor<TDocument> Store(bool? store = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.</para>
+	/// </summary>
 	public IpPropertyDescriptor<TDocument> TimeSeriesDimension(bool? timeSeriesDimension = true)
 	{
 		TimeSeriesDimensionValue = timeSeriesDimension;
@@ -371,40 +350,26 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IpPropertyDescriptor : SerializableDescriptor<IpPropertyDescriptor>, IBuildableDescriptor<IpProperty>
 {
 	internal IpPropertyDescriptor(Action<IpPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public IpPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private string? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
 
 	public IpPropertyDescriptor Boost(double? boost)
@@ -525,6 +490,9 @@ public IpPropertyDescriptor Store(bool? store = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.</para>
+	/// </summary>
 	public IpPropertyDescriptor TimeSeriesDimension(bool? timeSeriesDimension = true)
 	{
 		TimeSeriesDimensionValue = timeSeriesDimension;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpRangeProperty.g.cs
index 9913c1c15d4..fa4ddec643f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/IpRangeProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,80 +25,58 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class IpRangeProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "ip_range";
 }
 
 public sealed partial class IpRangePropertyDescriptor<TDocument> : SerializableDescriptor<IpRangePropertyDescriptor<TDocument>>, IBuildableDescriptor<IpRangeProperty>
 {
 	internal IpRangePropertyDescriptor(Action<IpRangePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IpRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public IpRangePropertyDescriptor<TDocument> Boost(double? boost)
@@ -299,32 +279,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IpRangePropertyDescriptor : SerializableDescriptor<IpRangePropertyDescriptor>, IBuildableDescriptor<IpRangeProperty>
 {
 	internal IpRangePropertyDescriptor(Action<IpRangePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public IpRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public IpRangePropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/JoinProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/JoinProperty.g.cs
index 9b0d1aed432..71c2e515b8b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/JoinProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/JoinProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,55 +25,43 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class JoinProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("eager_global_ordinals")]
 	public bool? EagerGlobalOrdinals { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("relations")]
 	public IDictionary<string, ICollection<string>>? Relations { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "join";
 }
 
 public sealed partial class JoinPropertyDescriptor<TDocument> : SerializableDescriptor<JoinPropertyDescriptor<TDocument>>, IBuildableDescriptor<JoinProperty>
 {
 	internal JoinPropertyDescriptor(Action<JoinPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public JoinPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EagerGlobalOrdinalsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private IDictionary<string, ICollection<string>>? RelationsValue { get; set; }
 
 	public JoinPropertyDescriptor<TDocument> Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
@@ -209,22 +199,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class JoinPropertyDescriptor : SerializableDescriptor<JoinPropertyDescriptor>, IBuildableDescriptor<JoinProperty>
 {
 	internal JoinPropertyDescriptor(Action<JoinPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public JoinPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EagerGlobalOrdinalsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private IDictionary<string, ICollection<string>>? RelationsValue { get; set; }
 
 	public JoinPropertyDescriptor Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/KeywordProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/KeywordProperty.g.cs
index 50281b1c63d..de0efcb6f45 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/KeywordProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/KeywordProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,110 +25,80 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class KeywordProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("eager_global_ordinals")]
 	public bool? EagerGlobalOrdinals { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_options")]
 	public Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptions { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("normalizer")]
 	public string? Normalizer { get; set; }
-
 	[JsonInclude, JsonPropertyName("norms")]
 	public bool? Norms { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public string? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("split_queries_on_whitespace")]
 	public bool? SplitQueriesOnWhitespace { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
+	/// <summary>
+	/// <para>For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "keyword";
 }
 
 public sealed partial class KeywordPropertyDescriptor<TDocument> : SerializableDescriptor<KeywordPropertyDescriptor<TDocument>>, IBuildableDescriptor<KeywordProperty>
 {
 	internal KeywordPropertyDescriptor(Action<KeywordPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public KeywordPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EagerGlobalOrdinalsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptionsValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private string? NormalizerValue { get; set; }
-
 	private bool? NormsValue { get; set; }
-
 	private string? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? SplitQueriesOnWhitespaceValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
 
 	public KeywordPropertyDescriptor<TDocument> Boost(double? boost)
@@ -259,6 +231,9 @@ public KeywordPropertyDescriptor<TDocument> Store(bool? store = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.</para>
+	/// </summary>
 	public KeywordPropertyDescriptor<TDocument> TimeSeriesDimension(bool? timeSeriesDimension = true)
 	{
 		TimeSeriesDimensionValue = timeSeriesDimension;
@@ -407,44 +382,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class KeywordPropertyDescriptor : SerializableDescriptor<KeywordPropertyDescriptor>, IBuildableDescriptor<KeywordProperty>
 {
 	internal KeywordPropertyDescriptor(Action<KeywordPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public KeywordPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EagerGlobalOrdinalsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptionsValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private string? NormalizerValue { get; set; }
-
 	private bool? NormsValue { get; set; }
-
 	private string? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? SplitQueriesOnWhitespaceValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
 
 	public KeywordPropertyDescriptor Boost(double? boost)
@@ -577,6 +536,9 @@ public KeywordPropertyDescriptor Store(bool? store = true)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>For internal use by Elastic only. Marks the field as a time series dimension. Defaults to false.</para>
+	/// </summary>
 	public KeywordPropertyDescriptor TimeSeriesDimension(bool? timeSeriesDimension = true)
 	{
 		TimeSeriesDimensionValue = timeSeriesDimension;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongNumberProperty.g.cs
index b1aa60323c8..7ac875847d9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongNumberProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,110 +25,76 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class LongNumberProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public long? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptError { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "long";
 }
 
 public sealed partial class LongNumberPropertyDescriptor<TDocument> : SerializableDescriptor<LongNumberPropertyDescriptor<TDocument>>, IBuildableDescriptor<LongNumberProperty>
 {
 	internal LongNumberPropertyDescriptor(Action<LongNumberPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public LongNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private long? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public LongNumberPropertyDescriptor<TDocument> Boost(double? boost)
@@ -407,44 +375,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class LongNumberPropertyDescriptor : SerializableDescriptor<LongNumberPropertyDescriptor>, IBuildableDescriptor<LongNumberProperty>
 {
 	internal LongNumberPropertyDescriptor(Action<LongNumberPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public LongNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private long? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public LongNumberPropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongRangeProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongRangeProperty.g.cs
index e771c68ca05..1b6a021f600 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongRangeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/LongRangeProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,80 +25,58 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class LongRangeProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "long_range";
 }
 
 public sealed partial class LongRangePropertyDescriptor<TDocument> : SerializableDescriptor<LongRangePropertyDescriptor<TDocument>>, IBuildableDescriptor<LongRangeProperty>
 {
 	internal LongRangePropertyDescriptor(Action<LongRangePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public LongRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public LongRangePropertyDescriptor<TDocument> Boost(double? boost)
@@ -299,32 +279,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class LongRangePropertyDescriptor : SerializableDescriptor<LongRangePropertyDescriptor>, IBuildableDescriptor<LongRangeProperty>
 {
 	internal LongRangePropertyDescriptor(Action<LongRangePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public LongRangePropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public LongRangePropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/MatchOnlyTextProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/MatchOnlyTextProperty.g.cs
index 06b61d353eb..5217314e7b8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/MatchOnlyTextProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/MatchOnlyTextProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,55 +25,80 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
+/// <summary>
+/// <para>A variant of text that trades scoring and efficiency of positional queries for space efficiency. This field<br/>effectively stores data the same way as a text field that only indexes documents (index_options: docs) and<br/>disables norms (norms: false). Term queries perform as fast if not faster as on text fields, however queries<br/>that need positions such as the match_phrase query perform slower as they need to look at the _source document<br/>to verify whether a phrase matches. All queries return constant scores that are equal to 1.0.</para>
+/// </summary>
 public sealed partial class MatchOnlyTextProperty : IProperty
 {
+	/// <summary>
+	/// <para>Allows you to copy the values of multiple fields into a group<br/>field, which can then be queried as a single field.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
 
+	/// <summary>
+	/// <para>Multi-fields allow the same string value to be indexed in multiple ways for different purposes, such as one<br/>field for search and a multi-field for sorting and aggregations, or the same string value analyzed by different analyzers.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
 
+	/// <summary>
+	/// <para>Metadata about the field.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "match_only_text";
 }
 
+/// <summary>
+/// <para>A variant of text that trades scoring and efficiency of positional queries for space efficiency. This field<br/>effectively stores data the same way as a text field that only indexes documents (index_options: docs) and<br/>disables norms (norms: false). Term queries perform as fast if not faster as on text fields, however queries<br/>that need positions such as the match_phrase query perform slower as they need to look at the _source document<br/>to verify whether a phrase matches. All queries return constant scores that are equal to 1.0.</para>
+/// </summary>
 public sealed partial class MatchOnlyTextPropertyDescriptor<TDocument> : SerializableDescriptor<MatchOnlyTextPropertyDescriptor<TDocument>>, IBuildableDescriptor<MatchOnlyTextProperty>
 {
 	internal MatchOnlyTextPropertyDescriptor(Action<MatchOnlyTextPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MatchOnlyTextPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
 
+	/// <summary>
+	/// <para>Allows you to copy the values of multiple fields into a group<br/>field, which can then be queried as a single field.</para>
+	/// </summary>
 	public MatchOnlyTextPropertyDescriptor<TDocument> CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
 	{
 		CopyToValue = copyTo;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Multi-fields allow the same string value to be indexed in multiple ways for different purposes, such as one<br/>field for search and a multi-field for sorting and aggregations, or the same string value analyzed by different analyzers.</para>
+	/// </summary>
 	public MatchOnlyTextPropertyDescriptor<TDocument> Fields(Elastic.Clients.Elasticsearch.Mapping.Properties? fields)
 	{
 		FieldsValue = fields;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Multi-fields allow the same string value to be indexed in multiple ways for different purposes, such as one<br/>field for search and a multi-field for sorting and aggregations, or the same string value analyzed by different analyzers.</para>
+	/// </summary>
 	public MatchOnlyTextPropertyDescriptor<TDocument> Fields(PropertiesDescriptor<TDocument> descriptor)
 	{
 		FieldsValue = descriptor.PromisedValue;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Multi-fields allow the same string value to be indexed in multiple ways for different purposes, such as one<br/>field for search and a multi-field for sorting and aggregations, or the same string value analyzed by different analyzers.</para>
+	/// </summary>
 	public MatchOnlyTextPropertyDescriptor<TDocument> Fields(Action<PropertiesDescriptor<TDocument>> configure)
 	{
 		var descriptor = new PropertiesDescriptor<TDocument>();
@@ -80,6 +107,9 @@ public MatchOnlyTextPropertyDescriptor<TDocument> Fields(Action<PropertiesDescri
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Metadata about the field.</para>
+	/// </summary>
 	public MatchOnlyTextPropertyDescriptor<TDocument> Meta(Func<FluentDictionary<string, string>, FluentDictionary<string, string>> selector)
 	{
 		MetaValue = selector?.Invoke(new FluentDictionary<string, string>());
@@ -120,37 +150,51 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	};
 }
 
+/// <summary>
+/// <para>A variant of text that trades scoring and efficiency of positional queries for space efficiency. This field<br/>effectively stores data the same way as a text field that only indexes documents (index_options: docs) and<br/>disables norms (norms: false). Term queries perform as fast if not faster as on text fields, however queries<br/>that need positions such as the match_phrase query perform slower as they need to look at the _source document<br/>to verify whether a phrase matches. All queries return constant scores that are equal to 1.0.</para>
+/// </summary>
 public sealed partial class MatchOnlyTextPropertyDescriptor : SerializableDescriptor<MatchOnlyTextPropertyDescriptor>, IBuildableDescriptor<MatchOnlyTextProperty>
 {
 	internal MatchOnlyTextPropertyDescriptor(Action<MatchOnlyTextPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public MatchOnlyTextPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
 
+	/// <summary>
+	/// <para>Allows you to copy the values of multiple fields into a group<br/>field, which can then be queried as a single field.</para>
+	/// </summary>
 	public MatchOnlyTextPropertyDescriptor CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
 	{
 		CopyToValue = copyTo;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Multi-fields allow the same string value to be indexed in multiple ways for different purposes, such as one<br/>field for search and a multi-field for sorting and aggregations, or the same string value analyzed by different analyzers.</para>
+	/// </summary>
 	public MatchOnlyTextPropertyDescriptor Fields(Elastic.Clients.Elasticsearch.Mapping.Properties? fields)
 	{
 		FieldsValue = fields;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Multi-fields allow the same string value to be indexed in multiple ways for different purposes, such as one<br/>field for search and a multi-field for sorting and aggregations, or the same string value analyzed by different analyzers.</para>
+	/// </summary>
 	public MatchOnlyTextPropertyDescriptor Fields<TDocument>(PropertiesDescriptor<TDocument> descriptor)
 	{
 		FieldsValue = descriptor.PromisedValue;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Multi-fields allow the same string value to be indexed in multiple ways for different purposes, such as one<br/>field for search and a multi-field for sorting and aggregations, or the same string value analyzed by different analyzers.</para>
+	/// </summary>
 	public MatchOnlyTextPropertyDescriptor Fields<TDocument>(Action<PropertiesDescriptor<TDocument>> configure)
 	{
 		var descriptor = new PropertiesDescriptor<TDocument>();
@@ -159,6 +203,9 @@ public MatchOnlyTextPropertyDescriptor Fields<TDocument>(Action<PropertiesDescri
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Metadata about the field.</para>
+	/// </summary>
 	public MatchOnlyTextPropertyDescriptor Meta(Func<FluentDictionary<string, string>, FluentDictionary<string, string>> selector)
 	{
 		MetaValue = selector?.Invoke(new FluentDictionary<string, string>());
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Murmur3HashProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Murmur3HashProperty.g.cs
index 7fc799a275a..d24a787dde2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Murmur3HashProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Murmur3HashProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,65 +25,49 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class Murmur3HashProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "murmur3";
 }
 
 public sealed partial class Murmur3HashPropertyDescriptor<TDocument> : SerializableDescriptor<Murmur3HashPropertyDescriptor<TDocument>>, IBuildableDescriptor<Murmur3HashProperty>
 {
 	internal Murmur3HashPropertyDescriptor(Action<Murmur3HashPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public Murmur3HashPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public Murmur3HashPropertyDescriptor<TDocument> CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
@@ -245,26 +231,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class Murmur3HashPropertyDescriptor : SerializableDescriptor<Murmur3HashPropertyDescriptor>, IBuildableDescriptor<Murmur3HashProperty>
 {
 	internal Murmur3HashPropertyDescriptor(Action<Murmur3HashPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public Murmur3HashPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public Murmur3HashPropertyDescriptor CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/NestedProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/NestedProperty.g.cs
index 7e224537776..fed963aefe5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/NestedProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/NestedProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,75 +25,55 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class NestedProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("enabled")]
 	public bool? Enabled { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("include_in_parent")]
 	public bool? IncludeInParent { get; set; }
-
 	[JsonInclude, JsonPropertyName("include_in_root")]
 	public bool? IncludeInRoot { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "nested";
 }
 
 public sealed partial class NestedPropertyDescriptor<TDocument> : SerializableDescriptor<NestedPropertyDescriptor<TDocument>>, IBuildableDescriptor<NestedProperty>
 {
 	internal NestedPropertyDescriptor(Action<NestedPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public NestedPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EnabledValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IncludeInParentValue { get; set; }
-
 	private bool? IncludeInRootValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public NestedPropertyDescriptor<TDocument> CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
@@ -281,30 +263,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class NestedPropertyDescriptor : SerializableDescriptor<NestedPropertyDescriptor>, IBuildableDescriptor<NestedProperty>
 {
 	internal NestedPropertyDescriptor(Action<NestedPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public NestedPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EnabledValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IncludeInParentValue { get; set; }
-
 	private bool? IncludeInRootValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public NestedPropertyDescriptor CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ObjectProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ObjectProperty.g.cs
index 34963d41f57..69716faed10 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ObjectProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ObjectProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,65 +25,49 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class ObjectProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("enabled")]
 	public bool? Enabled { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "object";
 }
 
 public sealed partial class ObjectPropertyDescriptor<TDocument> : SerializableDescriptor<ObjectPropertyDescriptor<TDocument>>, IBuildableDescriptor<ObjectProperty>
 {
 	internal ObjectPropertyDescriptor(Action<ObjectPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ObjectPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EnabledValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public ObjectPropertyDescriptor<TDocument> CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
@@ -245,26 +231,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ObjectPropertyDescriptor : SerializableDescriptor<ObjectPropertyDescriptor>, IBuildableDescriptor<ObjectProperty>
 {
 	internal ObjectPropertyDescriptor(Action<ObjectPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public ObjectPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EnabledValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public ObjectPropertyDescriptor CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PercolatorProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PercolatorProperty.g.cs
index 994035d99e5..de2eafc38ee 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PercolatorProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PercolatorProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,45 +25,37 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class PercolatorProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "percolator";
 }
 
 public sealed partial class PercolatorPropertyDescriptor<TDocument> : SerializableDescriptor<PercolatorPropertyDescriptor<TDocument>>, IBuildableDescriptor<PercolatorProperty>
 {
 	internal PercolatorPropertyDescriptor(Action<PercolatorPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PercolatorPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
 
 	public PercolatorPropertyDescriptor<TDocument> Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
@@ -173,18 +167,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class PercolatorPropertyDescriptor : SerializableDescriptor<PercolatorPropertyDescriptor>, IBuildableDescriptor<PercolatorProperty>
 {
 	internal PercolatorPropertyDescriptor(Action<PercolatorPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public PercolatorPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
 
 	public PercolatorPropertyDescriptor Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PointProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PointProperty.g.cs
index b4fdea63911..dbcee00cd09 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PointProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/PointProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,80 +25,58 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class PointProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_z_value")]
 	public bool? IgnoreZValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public string? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "point";
 }
 
 public sealed partial class PointPropertyDescriptor<TDocument> : SerializableDescriptor<PointPropertyDescriptor<TDocument>>, IBuildableDescriptor<PointProperty>
 {
 	internal PointPropertyDescriptor(Action<PointPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PointPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IgnoreZValueValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private string? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public PointPropertyDescriptor<TDocument> CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
@@ -299,32 +279,22 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class PointPropertyDescriptor : SerializableDescriptor<PointPropertyDescriptor>, IBuildableDescriptor<PointProperty>
 {
 	internal PointPropertyDescriptor(Action<PointPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public PointPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IgnoreZValueValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private string? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public PointPropertyDescriptor CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Properties.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Properties.g.cs
index 5f0edb24453..ff4fc37239d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Properties.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/Properties.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public partial class Properties : IsADictionary<PropertyName, IProperty>
 {
 	public Properties()
@@ -40,8 +42,8 @@ public Properties(IDictionary<PropertyName, IProperty> container) : base(contain
 
 	public void Add(PropertyName propertyName, IProperty property) => BackingDictionary.Add(Sanitize(propertyName), property);
 	public bool TryGetProperty(PropertyName propertyName, [NotNullWhen(returnValue: true)] out IProperty property) => BackingDictionary.TryGetValue(Sanitize(propertyName), out property);
-	public bool TryGetProperty<T>(PropertyName propertyName, [NotNullWhen(returnValue: true)] out T? property)
-		where T : class, IProperty
+
+	public bool TryGetProperty<T>(PropertyName propertyName, [NotNullWhen(returnValue: true)] out T? property) where T : class, IProperty
 	{
 		if (BackingDictionary.TryGetValue(Sanitize(propertyName), out var matchedValue) && matchedValue is T finalValue)
 		{
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RankFeatureProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RankFeatureProperty.g.cs
index 80192730cd3..0d6414f9efa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RankFeatureProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RankFeatureProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,50 +25,40 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class RankFeatureProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("positive_score_impact")]
 	public bool? PositiveScoreImpact { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "rank_feature";
 }
 
 public sealed partial class RankFeaturePropertyDescriptor<TDocument> : SerializableDescriptor<RankFeaturePropertyDescriptor<TDocument>>, IBuildableDescriptor<RankFeatureProperty>
 {
 	internal RankFeaturePropertyDescriptor(Action<RankFeaturePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RankFeaturePropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? PositiveScoreImpactValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
 
 	public RankFeaturePropertyDescriptor<TDocument> Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
@@ -191,20 +183,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RankFeaturePropertyDescriptor : SerializableDescriptor<RankFeaturePropertyDescriptor>, IBuildableDescriptor<RankFeatureProperty>
 {
 	internal RankFeaturePropertyDescriptor(Action<RankFeaturePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public RankFeaturePropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? PositiveScoreImpactValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
 
 	public RankFeaturePropertyDescriptor Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RankFeaturesProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RankFeaturesProperty.g.cs
index 582093b80e0..82f591ef976 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RankFeaturesProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RankFeaturesProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,45 +25,37 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class RankFeaturesProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "rank_features";
 }
 
 public sealed partial class RankFeaturesPropertyDescriptor<TDocument> : SerializableDescriptor<RankFeaturesPropertyDescriptor<TDocument>>, IBuildableDescriptor<RankFeaturesProperty>
 {
 	internal RankFeaturesPropertyDescriptor(Action<RankFeaturesPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RankFeaturesPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
 
 	public RankFeaturesPropertyDescriptor<TDocument> Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
@@ -173,18 +167,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RankFeaturesPropertyDescriptor : SerializableDescriptor<RankFeaturesPropertyDescriptor>, IBuildableDescriptor<RankFeaturesProperty>
 {
 	internal RankFeaturesPropertyDescriptor(Action<RankFeaturesPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public RankFeaturesPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
 
 	public RankFeaturesPropertyDescriptor Dynamic(Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? dynamic)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RoutingField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RoutingField.g.cs
index 27b0b268e2a..7f830541a9a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RoutingField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RoutingField.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class RoutingField
 {
 	[JsonInclude, JsonPropertyName("required")]
@@ -34,6 +36,7 @@ public sealed partial class RoutingField
 public sealed partial class RoutingFieldDescriptor : SerializableDescriptor<RoutingFieldDescriptor>
 {
 	internal RoutingFieldDescriptor(Action<RoutingFieldDescriptor> configure) => configure.Invoke(this);
+
 	public RoutingFieldDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RuntimeField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RuntimeField.g.cs
index 4e0fad2c8f9..5586d2355a5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RuntimeField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/RuntimeField.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class RuntimeField
 {
 	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.Mapping.RuntimeFieldType Type { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class RuntimeField
 public sealed partial class RuntimeFieldDescriptor : SerializableDescriptor<RuntimeFieldDescriptor>
 {
 	internal RuntimeFieldDescriptor(Action<RuntimeFieldDescriptor> configure) => configure.Invoke(this);
+
 	public RuntimeFieldDescriptor() : base()
 	{
 	}
 
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.RuntimeFieldType TypeValue { get; set; }
 
 	public RuntimeFieldDescriptor Format(string? format)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ScaledFloatNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ScaledFloatNumberProperty.g.cs
index 4422b0e4b5d..d258eaaf8e5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ScaledFloatNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ScaledFloatNumberProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,115 +25,79 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class ScaledFloatNumberProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public double? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptError { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("scaling_factor")]
 	public double? ScalingFactor { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "scaled_float";
 }
 
 public sealed partial class ScaledFloatNumberPropertyDescriptor<TDocument> : SerializableDescriptor<ScaledFloatNumberPropertyDescriptor<TDocument>>, IBuildableDescriptor<ScaledFloatNumberProperty>
 {
 	internal ScaledFloatNumberPropertyDescriptor(Action<ScaledFloatNumberPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ScaledFloatNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private double? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private double? ScalingFactorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public ScaledFloatNumberPropertyDescriptor<TDocument> Boost(double? boost)
@@ -425,46 +391,29 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ScaledFloatNumberPropertyDescriptor : SerializableDescriptor<ScaledFloatNumberPropertyDescriptor>, IBuildableDescriptor<ScaledFloatNumberProperty>
 {
 	internal ScaledFloatNumberPropertyDescriptor(Action<ScaledFloatNumberPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public ScaledFloatNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private double? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private double? ScalingFactorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public ScaledFloatNumberPropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SearchAsYouTypeProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SearchAsYouTypeProperty.g.cs
index 9c5bcb9a077..10158a85fb5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SearchAsYouTypeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SearchAsYouTypeProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,100 +25,70 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class SearchAsYouTypeProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_options")]
 	public Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptions { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_shingle_size")]
 	public int? MaxShingleSize { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("norms")]
 	public bool? Norms { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_analyzer")]
 	public string? SearchAnalyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_quote_analyzer")]
 	public string? SearchQuoteAnalyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("term_vector")]
 	public Elastic.Clients.Elasticsearch.Mapping.TermVectorOption? TermVector { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "search_as_you_type";
 }
 
 public sealed partial class SearchAsYouTypePropertyDescriptor<TDocument> : SerializableDescriptor<SearchAsYouTypePropertyDescriptor<TDocument>>, IBuildableDescriptor<SearchAsYouTypeProperty>
 {
 	internal SearchAsYouTypePropertyDescriptor(Action<SearchAsYouTypePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SearchAsYouTypePropertyDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptionsValue { get; set; }
-
 	private int? MaxShingleSizeValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? NormsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SearchAnalyzerValue { get; set; }
-
 	private string? SearchQuoteAnalyzerValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TermVectorOption? TermVectorValue { get; set; }
 
 	public SearchAsYouTypePropertyDescriptor<TDocument> Analyzer(string? analyzer)
@@ -371,40 +343,26 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SearchAsYouTypePropertyDescriptor : SerializableDescriptor<SearchAsYouTypePropertyDescriptor>, IBuildableDescriptor<SearchAsYouTypeProperty>
 {
 	internal SearchAsYouTypePropertyDescriptor(Action<SearchAsYouTypePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public SearchAsYouTypePropertyDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptionsValue { get; set; }
-
 	private int? MaxShingleSizeValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? NormsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SearchAnalyzerValue { get; set; }
-
 	private string? SearchQuoteAnalyzerValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TermVectorOption? TermVectorValue { get; set; }
 
 	public SearchAsYouTypePropertyDescriptor Analyzer(string? analyzer)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShapeProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShapeProperty.g.cs
index 72cf3e6162b..682bd85fb60 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShapeProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShapeProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,85 +25,67 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
+/// <summary>
+/// <para>The `shape` data type facilitates the indexing of and searching with arbitrary `x, y` cartesian shapes such as<br/>rectangles and polygons.</para>
+/// </summary>
 public sealed partial class ShapeProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_z_value")]
 	public bool? IgnoreZValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("orientation")]
 	public Elastic.Clients.Elasticsearch.Mapping.GeoOrientation? Orientation { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "shape";
 }
 
+/// <summary>
+/// <para>The `shape` data type facilitates the indexing of and searching with arbitrary `x, y` cartesian shapes such as<br/>rectangles and polygons.</para>
+/// </summary>
 public sealed partial class ShapePropertyDescriptor<TDocument> : SerializableDescriptor<ShapePropertyDescriptor<TDocument>>, IBuildableDescriptor<ShapeProperty>
 {
 	internal ShapePropertyDescriptor(Action<ShapePropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ShapePropertyDescriptor() : base()
 	{
 	}
 
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IgnoreZValueValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.GeoOrientation? OrientationValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public ShapePropertyDescriptor<TDocument> Coerce(bool? coerce = true)
@@ -314,37 +298,29 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	};
 }
 
+/// <summary>
+/// <para>The `shape` data type facilitates the indexing of and searching with arbitrary `x, y` cartesian shapes such as<br/>rectangles and polygons.</para>
+/// </summary>
 public sealed partial class ShapePropertyDescriptor : SerializableDescriptor<ShapePropertyDescriptor>, IBuildableDescriptor<ShapeProperty>
 {
 	internal ShapePropertyDescriptor(Action<ShapePropertyDescriptor> configure) => configure.Invoke(this);
+
 	public ShapePropertyDescriptor() : base()
 	{
 	}
 
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IgnoreZValueValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.GeoOrientation? OrientationValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public ShapePropertyDescriptor Coerce(bool? coerce = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShortNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShortNumberProperty.g.cs
index 1ffc6a185dd..03308e52a4f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShortNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/ShortNumberProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,110 +25,76 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class ShortNumberProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public double? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptError { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "short";
 }
 
 public sealed partial class ShortNumberPropertyDescriptor<TDocument> : SerializableDescriptor<ShortNumberPropertyDescriptor<TDocument>>, IBuildableDescriptor<ShortNumberProperty>
 {
 	internal ShortNumberPropertyDescriptor(Action<ShortNumberPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ShortNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private double? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public ShortNumberPropertyDescriptor<TDocument> Boost(double? boost)
@@ -407,44 +375,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ShortNumberPropertyDescriptor : SerializableDescriptor<ShortNumberPropertyDescriptor>, IBuildableDescriptor<ShortNumberProperty>
 {
 	internal ShortNumberPropertyDescriptor(Action<ShortNumberPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public ShortNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private double? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public ShortNumberPropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SizeField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SizeField.g.cs
index a42e284f86b..9255a8a5cbf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SizeField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SizeField.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class SizeField
 {
 	[JsonInclude, JsonPropertyName("enabled")]
@@ -34,6 +36,7 @@ public sealed partial class SizeField
 public sealed partial class SizeFieldDescriptor : SerializableDescriptor<SizeFieldDescriptor>
 {
 	internal SizeFieldDescriptor(Action<SizeFieldDescriptor> configure) => configure.Invoke(this);
+
 	public SizeFieldDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SourceField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SourceField.g.cs
index 04b969b9d3a..9e6c2c0e626 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SourceField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SourceField.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class SourceField
 {
 	[JsonInclude, JsonPropertyName("compress")]
 	public bool? Compress { get; set; }
-
 	[JsonInclude, JsonPropertyName("compress_threshold")]
 	public string? CompressThreshold { get; set; }
-
 	[JsonInclude, JsonPropertyName("enabled")]
 	public bool? Enabled { get; set; }
-
 	[JsonInclude, JsonPropertyName("excludes")]
 	public ICollection<string>? Excludes { get; set; }
-
 	[JsonInclude, JsonPropertyName("includes")]
 	public ICollection<string>? Includes { get; set; }
-
 	[JsonInclude, JsonPropertyName("mode")]
 	public Elastic.Clients.Elasticsearch.Mapping.SourceFieldMode? Mode { get; set; }
 }
@@ -49,20 +46,16 @@ public sealed partial class SourceField
 public sealed partial class SourceFieldDescriptor : SerializableDescriptor<SourceFieldDescriptor>
 {
 	internal SourceFieldDescriptor(Action<SourceFieldDescriptor> configure) => configure.Invoke(this);
+
 	public SourceFieldDescriptor() : base()
 	{
 	}
 
 	private bool? CompressValue { get; set; }
-
 	private string? CompressThresholdValue { get; set; }
-
 	private bool? EnabledValue { get; set; }
-
 	private ICollection<string>? ExcludesValue { get; set; }
-
 	private ICollection<string>? IncludesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.SourceFieldMode? ModeValue { get; set; }
 
 	public SourceFieldDescriptor Compress(bool? compress = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SuggestContext.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SuggestContext.g.cs
index 7ea07b2e660..7c144f4534f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SuggestContext.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/SuggestContext.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class SuggestContext
 {
 	[JsonInclude, JsonPropertyName("name")]
 	public Elastic.Clients.Elasticsearch.Name Name { get; set; }
-
 	[JsonInclude, JsonPropertyName("path")]
 	public Elastic.Clients.Elasticsearch.Field? Path { get; set; }
-
 	[JsonInclude, JsonPropertyName("precision")]
 	public Union<int?, string?>? Precision { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; set; }
 }
@@ -43,16 +42,14 @@ public sealed partial class SuggestContext
 public sealed partial class SuggestContextDescriptor<TDocument> : SerializableDescriptor<SuggestContextDescriptor<TDocument>>
 {
 	internal SuggestContextDescriptor(Action<SuggestContextDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SuggestContextDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Name NameValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? PathValue { get; set; }
-
 	private Union<int?, string?>? PrecisionValue { get; set; }
-
 	private string TypeValue { get; set; }
 
 	public SuggestContextDescriptor<TDocument> Name(Elastic.Clients.Elasticsearch.Name name)
@@ -111,16 +108,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SuggestContextDescriptor : SerializableDescriptor<SuggestContextDescriptor>
 {
 	internal SuggestContextDescriptor(Action<SuggestContextDescriptor> configure) => configure.Invoke(this);
+
 	public SuggestContextDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Name NameValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? PathValue { get; set; }
-
 	private Union<int?, string?>? PrecisionValue { get; set; }
-
 	private string TypeValue { get; set; }
 
 	public SuggestContextDescriptor Name(Elastic.Clients.Elasticsearch.Name name)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TextIndexPrefixes.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TextIndexPrefixes.g.cs
index 8273ef513ed..f55e55ce94d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TextIndexPrefixes.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TextIndexPrefixes.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class TextIndexPrefixes
 {
 	[JsonInclude, JsonPropertyName("max_chars")]
 	public int MaxChars { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_chars")]
 	public int MinChars { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class TextIndexPrefixes
 public sealed partial class TextIndexPrefixesDescriptor : SerializableDescriptor<TextIndexPrefixesDescriptor>, IBuildableDescriptor<TextIndexPrefixes>
 {
 	internal TextIndexPrefixesDescriptor(Action<TextIndexPrefixesDescriptor> configure) => configure.Invoke(this);
+
 	public TextIndexPrefixesDescriptor() : base()
 	{
 	}
 
 	private int MaxCharsValue { get; set; }
-
 	private int MinCharsValue { get; set; }
 
 	public TextIndexPrefixesDescriptor MaxChars(int maxChars)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TextProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TextProperty.g.cs
index c7272e2e51c..09d7d583b81 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TextProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TextProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,138 +25,92 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class TextProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("eager_global_ordinals")]
 	public bool? EagerGlobalOrdinals { get; set; }
-
 	[JsonInclude, JsonPropertyName("fielddata")]
 	public bool? Fielddata { get; set; }
-
 	[JsonInclude, JsonPropertyName("fielddata_frequency_filter")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.FielddataFrequencyFilter? FielddataFrequencyFilter { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_options")]
 	public Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptions { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_phrases")]
 	public bool? IndexPhrases { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_prefixes")]
 	public Elastic.Clients.Elasticsearch.Mapping.TextIndexPrefixes? IndexPrefixes { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("norms")]
 	public bool? Norms { get; set; }
-
 	[JsonInclude, JsonPropertyName("position_increment_gap")]
 	public int? PositionIncrementGap { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_analyzer")]
 	public string? SearchAnalyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("search_quote_analyzer")]
 	public string? SearchQuoteAnalyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("term_vector")]
 	public Elastic.Clients.Elasticsearch.Mapping.TermVectorOption? TermVector { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "text";
 }
 
 public sealed partial class TextPropertyDescriptor<TDocument> : SerializableDescriptor<TextPropertyDescriptor<TDocument>>, IBuildableDescriptor<TextProperty>
 {
 	internal TextPropertyDescriptor(Action<TextPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TextPropertyDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EagerGlobalOrdinalsValue { get; set; }
-
 	private bool? FielddataValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.FielddataFrequencyFilter? FielddataFrequencyFilterValue { get; set; }
-
 	private IndexManagement.FielddataFrequencyFilterDescriptor FielddataFrequencyFilterDescriptor { get; set; }
-
 	private Action<IndexManagement.FielddataFrequencyFilterDescriptor> FielddataFrequencyFilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptionsValue { get; set; }
-
 	private bool? IndexPhrasesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TextIndexPrefixes? IndexPrefixesValue { get; set; }
-
 	private TextIndexPrefixesDescriptor IndexPrefixesDescriptor { get; set; }
-
 	private Action<TextIndexPrefixesDescriptor> IndexPrefixesDescriptorAction { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? NormsValue { get; set; }
-
 	private int? PositionIncrementGapValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SearchAnalyzerValue { get; set; }
-
 	private string? SearchQuoteAnalyzerValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TermVectorOption? TermVectorValue { get; set; }
 
 	public TextPropertyDescriptor<TDocument> Analyzer(string? analyzer)
@@ -591,60 +547,36 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TextPropertyDescriptor : SerializableDescriptor<TextPropertyDescriptor>, IBuildableDescriptor<TextProperty>
 {
 	internal TextPropertyDescriptor(Action<TextPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public TextPropertyDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EagerGlobalOrdinalsValue { get; set; }
-
 	private bool? FielddataValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexManagement.FielddataFrequencyFilter? FielddataFrequencyFilterValue { get; set; }
-
 	private IndexManagement.FielddataFrequencyFilterDescriptor FielddataFrequencyFilterDescriptor { get; set; }
-
 	private Action<IndexManagement.FielddataFrequencyFilterDescriptor> FielddataFrequencyFilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexOptions? IndexOptionsValue { get; set; }
-
 	private bool? IndexPhrasesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TextIndexPrefixes? IndexPrefixesValue { get; set; }
-
 	private TextIndexPrefixesDescriptor IndexPrefixesDescriptor { get; set; }
-
 	private Action<TextIndexPrefixesDescriptor> IndexPrefixesDescriptorAction { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private bool? NormsValue { get; set; }
-
 	private int? PositionIncrementGapValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SearchAnalyzerValue { get; set; }
-
 	private string? SearchQuoteAnalyzerValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TermVectorOption? TermVectorValue { get; set; }
 
 	public TextPropertyDescriptor Analyzer(string? analyzer)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TokenCountProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TokenCountProperty.g.cs
index 18adaed72e2..3b50c9e718c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TokenCountProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TokenCountProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,90 +25,64 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class TokenCountProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("enable_position_increments")]
 	public bool? EnablePositionIncrements { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public double? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "token_count";
 }
 
 public sealed partial class TokenCountPropertyDescriptor<TDocument> : SerializableDescriptor<TokenCountPropertyDescriptor<TDocument>>, IBuildableDescriptor<TokenCountProperty>
 {
 	internal TokenCountPropertyDescriptor(Action<TokenCountPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TokenCountPropertyDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EnablePositionIncrementsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private double? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public TokenCountPropertyDescriptor<TDocument> Analyzer(string? analyzer)
@@ -335,36 +311,24 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TokenCountPropertyDescriptor : SerializableDescriptor<TokenCountPropertyDescriptor>, IBuildableDescriptor<TokenCountProperty>
 {
 	internal TokenCountPropertyDescriptor(Action<TokenCountPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public TokenCountPropertyDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private double? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private bool? EnablePositionIncrementsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private double? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public TokenCountPropertyDescriptor Analyzer(string? analyzer)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TypeMapping.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TypeMapping.g.cs
index 8e0b02dabc4..84ff122abf8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TypeMapping.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/TypeMapping.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,55 +25,40 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class TypeMapping
 {
 	[JsonInclude, JsonPropertyName("_data_stream_timestamp")]
 	public Elastic.Clients.Elasticsearch.Mapping.DataStreamTimestamp? DataStreamTimestamp { get; set; }
-
 	[JsonInclude, JsonPropertyName("_field_names")]
 	public Elastic.Clients.Elasticsearch.Mapping.FieldNamesField? FieldNames { get; set; }
-
 	[JsonInclude, JsonPropertyName("_meta")]
 	public IDictionary<string, object>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("_routing")]
 	public Elastic.Clients.Elasticsearch.Mapping.RoutingField? Routing { get; set; }
-
 	[JsonInclude, JsonPropertyName("_size")]
 	public Elastic.Clients.Elasticsearch.Mapping.SizeField? Size { get; set; }
-
 	[JsonInclude, JsonPropertyName("_source")]
 	public Elastic.Clients.Elasticsearch.Mapping.SourceField? Source { get; set; }
-
 	[JsonInclude, JsonPropertyName("all_field")]
 	public Elastic.Clients.Elasticsearch.Mapping.AllField? AllField { get; set; }
-
 	[JsonInclude, JsonPropertyName("date_detection")]
 	public bool? DateDetection { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic_date_formats")]
 	public ICollection<string>? DynamicDateFormats { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic_templates")]
 	public ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>? DynamicTemplates { get; set; }
-
 	[JsonInclude, JsonPropertyName("enabled")]
 	public bool? Enabled { get; set; }
-
 	[JsonInclude, JsonPropertyName("index_field")]
 	public Elastic.Clients.Elasticsearch.Mapping.IndexField? IndexField { get; set; }
-
 	[JsonInclude, JsonPropertyName("numeric_detection")]
 	public bool? NumericDetection { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("runtime")]
 	public IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? Runtime { get; set; }
 }
@@ -79,68 +66,40 @@ public sealed partial class TypeMapping
 public sealed partial class TypeMappingDescriptor<TDocument> : SerializableDescriptor<TypeMappingDescriptor<TDocument>>
 {
 	internal TypeMappingDescriptor(Action<TypeMappingDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TypeMappingDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DataStreamTimestamp? DataStreamTimestampValue { get; set; }
-
 	private DataStreamTimestampDescriptor DataStreamTimestampDescriptor { get; set; }
-
 	private Action<DataStreamTimestampDescriptor> DataStreamTimestampDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.FieldNamesField? FieldNamesValue { get; set; }
-
 	private FieldNamesFieldDescriptor FieldNamesDescriptor { get; set; }
-
 	private Action<FieldNamesFieldDescriptor> FieldNamesDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.RoutingField? RoutingValue { get; set; }
-
 	private RoutingFieldDescriptor RoutingDescriptor { get; set; }
-
 	private Action<RoutingFieldDescriptor> RoutingDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.SizeField? SizeValue { get; set; }
-
 	private SizeFieldDescriptor SizeDescriptor { get; set; }
-
 	private Action<SizeFieldDescriptor> SizeDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.SourceField? SourceValue { get; set; }
-
 	private SourceFieldDescriptor SourceDescriptor { get; set; }
-
 	private Action<SourceFieldDescriptor> SourceDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.AllField? AllFieldValue { get; set; }
-
 	private AllFieldDescriptor AllFieldDescriptor { get; set; }
-
 	private Action<AllFieldDescriptor> AllFieldDescriptorAction { get; set; }
-
 	private bool? DateDetectionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private ICollection<string>? DynamicDateFormatsValue { get; set; }
-
 	private ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>? DynamicTemplatesValue { get; set; }
-
 	private bool? EnabledValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexField? IndexFieldValue { get; set; }
-
 	private IndexFieldDescriptor IndexFieldDescriptor { get; set; }
-
 	private Action<IndexFieldDescriptor> IndexFieldDescriptorAction { get; set; }
-
 	private bool? NumericDetectionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeValue { get; set; }
 
 	public TypeMappingDescriptor<TDocument> DataStreamTimestamp(Elastic.Clients.Elasticsearch.Mapping.DataStreamTimestamp? dataStreamTimestamp)
@@ -555,68 +514,40 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TypeMappingDescriptor : SerializableDescriptor<TypeMappingDescriptor>
 {
 	internal TypeMappingDescriptor(Action<TypeMappingDescriptor> configure) => configure.Invoke(this);
+
 	public TypeMappingDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Mapping.DataStreamTimestamp? DataStreamTimestampValue { get; set; }
-
 	private DataStreamTimestampDescriptor DataStreamTimestampDescriptor { get; set; }
-
 	private Action<DataStreamTimestampDescriptor> DataStreamTimestampDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.FieldNamesField? FieldNamesValue { get; set; }
-
 	private FieldNamesFieldDescriptor FieldNamesDescriptor { get; set; }
-
 	private Action<FieldNamesFieldDescriptor> FieldNamesDescriptorAction { get; set; }
-
 	private IDictionary<string, object>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.RoutingField? RoutingValue { get; set; }
-
 	private RoutingFieldDescriptor RoutingDescriptor { get; set; }
-
 	private Action<RoutingFieldDescriptor> RoutingDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.SizeField? SizeValue { get; set; }
-
 	private SizeFieldDescriptor SizeDescriptor { get; set; }
-
 	private Action<SizeFieldDescriptor> SizeDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.SourceField? SourceValue { get; set; }
-
 	private SourceFieldDescriptor SourceDescriptor { get; set; }
-
 	private Action<SourceFieldDescriptor> SourceDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.AllField? AllFieldValue { get; set; }
-
 	private AllFieldDescriptor AllFieldDescriptor { get; set; }
-
 	private Action<AllFieldDescriptor> AllFieldDescriptorAction { get; set; }
-
 	private bool? DateDetectionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private ICollection<string>? DynamicDateFormatsValue { get; set; }
-
 	private ICollection<IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.DynamicTemplate>>? DynamicTemplatesValue { get; set; }
-
 	private bool? EnabledValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.IndexField? IndexFieldValue { get; set; }
-
 	private IndexFieldDescriptor IndexFieldDescriptor { get; set; }
-
 	private Action<IndexFieldDescriptor> IndexFieldDescriptorAction { get; set; }
-
 	private bool? NumericDetectionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private IDictionary<string, Elastic.Clients.Elasticsearch.Mapping.RuntimeField>? RuntimeValue { get; set; }
 
 	public TypeMappingDescriptor DataStreamTimestamp(Elastic.Clients.Elasticsearch.Mapping.DataStreamTimestamp? dataStreamTimestamp)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/UnsignedLongNumberProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/UnsignedLongNumberProperty.g.cs
index 9009c24dbf3..c952310b4cc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/UnsignedLongNumberProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/UnsignedLongNumberProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,110 +25,76 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class UnsignedLongNumberProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("boost")]
 	public double? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("coerce")]
 	public bool? Coerce { get; set; }
-
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_malformed")]
 	public bool? IgnoreMalformed { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public bool? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public long? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("on_script_error")]
 	public Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptError { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script? Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_dimension")]
 	public bool? TimeSeriesDimension { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_series_metric")]
 	public Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetric { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "unsigned_long";
 }
 
 public sealed partial class UnsignedLongNumberPropertyDescriptor<TDocument> : SerializableDescriptor<UnsignedLongNumberPropertyDescriptor<TDocument>>, IBuildableDescriptor<UnsignedLongNumberProperty>
 {
 	internal UnsignedLongNumberPropertyDescriptor(Action<UnsignedLongNumberPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public UnsignedLongNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private long? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public UnsignedLongNumberPropertyDescriptor<TDocument> Boost(double? boost)
@@ -407,44 +375,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class UnsignedLongNumberPropertyDescriptor : SerializableDescriptor<UnsignedLongNumberPropertyDescriptor>, IBuildableDescriptor<UnsignedLongNumberProperty>
 {
 	internal UnsignedLongNumberPropertyDescriptor(Action<UnsignedLongNumberPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public UnsignedLongNumberPropertyDescriptor() : base()
 	{
 	}
 
 	private double? BoostValue { get; set; }
-
 	private bool? CoerceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private bool? IgnoreMalformedValue { get; set; }
-
 	private bool? IndexValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private long? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.OnScriptError? OnScriptErrorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
-
 	private bool? TimeSeriesDimensionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.TimeSeriesMetricType? TimeSeriesMetricValue { get; set; }
 
 	public UnsignedLongNumberPropertyDescriptor Boost(double? boost)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/VersionProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/VersionProperty.g.cs
index 28840fa389a..d42f21fc4a4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/VersionProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/VersionProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,65 +25,49 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class VersionProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "version";
 }
 
 public sealed partial class VersionPropertyDescriptor<TDocument> : SerializableDescriptor<VersionPropertyDescriptor<TDocument>>, IBuildableDescriptor<VersionProperty>
 {
 	internal VersionPropertyDescriptor(Action<VersionPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public VersionPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public VersionPropertyDescriptor<TDocument> CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
@@ -245,26 +231,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class VersionPropertyDescriptor : SerializableDescriptor<VersionPropertyDescriptor>, IBuildableDescriptor<VersionProperty>
 {
 	internal VersionPropertyDescriptor(Action<VersionPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public VersionPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public VersionPropertyDescriptor CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/WildcardProperty.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/WildcardProperty.g.cs
index 6ebc007f404..3469cbf742b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/WildcardProperty.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Mapping/WildcardProperty.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,70 +25,52 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Mapping;
+
 public sealed partial class WildcardProperty : IProperty
 {
 	[JsonInclude, JsonPropertyName("copy_to")]
 	public Elastic.Clients.Elasticsearch.Fields? CopyTo { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc_values")]
 	public bool? DocValues { get; set; }
-
 	[JsonInclude, JsonPropertyName("dynamic")]
 	public Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? Dynamic { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_above")]
 	public int? IgnoreAbove { get; set; }
-
 	[JsonInclude, JsonPropertyName("meta")]
 	public IDictionary<string, string>? Meta { get; set; }
-
 	[JsonInclude, JsonPropertyName("null_value")]
 	public string? NullValue { get; set; }
-
 	[JsonInclude, JsonPropertyName("properties")]
 	public Elastic.Clients.Elasticsearch.Mapping.Properties? Properties { get; set; }
-
 	[JsonInclude, JsonPropertyName("similarity")]
 	public string? Similarity { get; set; }
-
 	[JsonInclude, JsonPropertyName("store")]
 	public bool? Store { get; set; }
 
-	[JsonInclude]
-	[JsonPropertyName("type")]
+	[JsonInclude, JsonPropertyName("type")]
 	public string Type => "wildcard";
 }
 
 public sealed partial class WildcardPropertyDescriptor<TDocument> : SerializableDescriptor<WildcardPropertyDescriptor<TDocument>>, IBuildableDescriptor<WildcardProperty>
 {
 	internal WildcardPropertyDescriptor(Action<WildcardPropertyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public WildcardPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private string? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public WildcardPropertyDescriptor<TDocument> CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
@@ -263,28 +247,20 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class WildcardPropertyDescriptor : SerializableDescriptor<WildcardPropertyDescriptor>, IBuildableDescriptor<WildcardProperty>
 {
 	internal WildcardPropertyDescriptor(Action<WildcardPropertyDescriptor> configure) => configure.Invoke(this);
+
 	public WildcardPropertyDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Fields? CopyToValue { get; set; }
-
 	private bool? DocValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.DynamicMapping? DynamicValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? FieldsValue { get; set; }
-
 	private int? IgnoreAboveValue { get; set; }
-
 	private IDictionary<string, string>? MetaValue { get; set; }
-
 	private string? NullValueValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Mapping.Properties? PropertiesValue { get; set; }
-
 	private string? SimilarityValue { get; set; }
-
 	private bool? StoreValue { get; set; }
 
 	public WildcardPropertyDescriptor CopyTo(Elastic.Clients.Elasticsearch.Fields? copyTo)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MergesStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MergesStats.g.cs
index cc2b9242344..3d1ad0d141c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/MergesStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/MergesStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,55 +25,40 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class MergesStats
 {
 	[JsonInclude, JsonPropertyName("current")]
 	public long Current { get; init; }
-
 	[JsonInclude, JsonPropertyName("current_docs")]
 	public long CurrentDocs { get; init; }
-
 	[JsonInclude, JsonPropertyName("current_size")]
 	public string? CurrentSize { get; init; }
-
 	[JsonInclude, JsonPropertyName("current_size_in_bytes")]
 	public long CurrentSizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public long Total { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_auto_throttle")]
 	public string? TotalAutoThrottle { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_auto_throttle_in_bytes")]
 	public long TotalAutoThrottleInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_docs")]
 	public long TotalDocs { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_size")]
 	public string? TotalSize { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_size_in_bytes")]
 	public long TotalSizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_stopped_time")]
 	public Elastic.Clients.Elasticsearch.Duration? TotalStoppedTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_stopped_time_in_millis")]
 	public long TotalStoppedTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_throttled_time")]
 	public Elastic.Clients.Elasticsearch.Duration? TotalThrottledTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_throttled_time_in_millis")]
 	public long TotalThrottledTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_time")]
 	public Elastic.Clients.Elasticsearch.Duration? TotalTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_time_in_millis")]
 	public long TotalTimeInMillis { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ClassificationInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ClassificationInferenceOptions.g.cs
index 0afb0f8415c..e750cfee4fd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ClassificationInferenceOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ClassificationInferenceOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,37 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 public sealed partial class ClassificationInferenceOptions
 {
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("num_top_classes")]
 	public int? NumTopClasses { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the maximum number of feature importance values per document.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("num_top_feature_importance_values")]
 	public int? NumTopFeatureImportanceValues { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the type of the predicted field to write. Acceptable values are: string, number, boolean. When boolean is provided 1.0 is transformed to true and 0.0 to false.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("prediction_field_type")]
 	public string? PredictionFieldType { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the field to which the top classes are written. Defaults to top_classes.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("top_classes_results_field")]
 	public string? TopClassesResultsField { get; set; }
 }
@@ -46,44 +63,56 @@ public sealed partial class ClassificationInferenceOptions
 public sealed partial class ClassificationInferenceOptionsDescriptor : SerializableDescriptor<ClassificationInferenceOptionsDescriptor>
 {
 	internal ClassificationInferenceOptionsDescriptor(Action<ClassificationInferenceOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public ClassificationInferenceOptionsDescriptor() : base()
 	{
 	}
 
 	private int? NumTopClassesValue { get; set; }
-
 	private int? NumTopFeatureImportanceValuesValue { get; set; }
-
 	private string? PredictionFieldTypeValue { get; set; }
-
 	private string? ResultsFieldValue { get; set; }
-
 	private string? TopClassesResultsFieldValue { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	public ClassificationInferenceOptionsDescriptor NumTopClasses(int? numTopClasses)
 	{
 		NumTopClassesValue = numTopClasses;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the maximum number of feature importance values per document.</para>
+	/// </summary>
 	public ClassificationInferenceOptionsDescriptor NumTopFeatureImportanceValues(int? numTopFeatureImportanceValues)
 	{
 		NumTopFeatureImportanceValuesValue = numTopFeatureImportanceValues;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the type of the predicted field to write. Acceptable values are: string, number, boolean. When boolean is provided 1.0 is transformed to true and 0.0 to false.</para>
+	/// </summary>
 	public ClassificationInferenceOptionsDescriptor PredictionFieldType(string? predictionFieldType)
 	{
 		PredictionFieldTypeValue = predictionFieldType;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public ClassificationInferenceOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the field to which the top classes are written. Defaults to top_classes.</para>
+	/// </summary>
 	public ClassificationInferenceOptionsDescriptor TopClassesResultsField(string? topClassesResultsField)
 	{
 		TopClassesResultsFieldValue = topClassesResultsField;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceOptions.g.cs
index d03038b22bc..6b10b0bfdc3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,51 +25,72 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
+/// <summary>
+/// <para>Fill mask inference options</para>
+/// </summary>
 public sealed partial class FillMaskInferenceOptions
 {
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("num_top_classes")]
 	public int? NumTopClasses { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; }
 
 	public static implicit operator InferenceConfigCreate(FillMaskInferenceOptions fillMaskInferenceOptions) => Ml.InferenceConfigCreate.FillMask(fillMaskInferenceOptions);
 }
 
+/// <summary>
+/// <para>Fill mask inference options</para>
+/// </summary>
 public sealed partial class FillMaskInferenceOptionsDescriptor : SerializableDescriptor<FillMaskInferenceOptionsDescriptor>
 {
 	internal FillMaskInferenceOptionsDescriptor(Action<FillMaskInferenceOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public FillMaskInferenceOptionsDescriptor() : base()
 	{
 	}
 
 	private int? NumTopClassesValue { get; set; }
-
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; }
-
 	private TokenizationConfigDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<TokenizationConfigDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	public FillMaskInferenceOptionsDescriptor NumTopClasses(int? numTopClasses)
 	{
 		NumTopClassesValue = numTopClasses;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public FillMaskInferenceOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	public FillMaskInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceUpdateOptions.g.cs
index 44f82240bed..4a8d5bff084 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceUpdateOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/FillMaskInferenceUpdateOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,25 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 public sealed partial class FillMaskInferenceUpdateOptions
 {
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("num_top_classes")]
 	public int? NumTopClasses { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; }
 
@@ -42,32 +53,38 @@ public sealed partial class FillMaskInferenceUpdateOptions
 public sealed partial class FillMaskInferenceUpdateOptionsDescriptor : SerializableDescriptor<FillMaskInferenceUpdateOptionsDescriptor>
 {
 	internal FillMaskInferenceUpdateOptionsDescriptor(Action<FillMaskInferenceUpdateOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public FillMaskInferenceUpdateOptionsDescriptor() : base()
 	{
 	}
 
 	private int? NumTopClassesValue { get; set; }
-
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? TokenizationValue { get; set; }
-
 	private NlpTokenizationUpdateOptionsDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<NlpTokenizationUpdateOptionsDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	public FillMaskInferenceUpdateOptionsDescriptor NumTopClasses(int? numTopClasses)
 	{
 		NumTopClassesValue = numTopClasses;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public FillMaskInferenceUpdateOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	public FillMaskInferenceUpdateOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreate.g.cs
index 8418446f2a1..a35a57fb6c8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,9 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 [JsonConverter(typeof(InferenceConfigCreateConverter))]
+/// <summary>
+/// <para>Inference configuration provided when storing the model config</para>
+/// </summary>
 public sealed partial class InferenceConfigCreate
 {
 	internal InferenceConfigCreate(string variantName, object variant)
@@ -41,7 +46,6 @@ internal InferenceConfigCreate(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static InferenceConfigCreate Classification(Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfigCreate("classification", classificationInferenceOptions);
@@ -180,20 +184,17 @@ public override void Write(Utf8JsonWriter writer, InferenceConfigCreate value, J
 public sealed partial class InferenceConfigCreateDescriptor<TDocument> : SerializableDescriptor<InferenceConfigCreateDescriptor<TDocument>>
 {
 	internal InferenceConfigCreateDescriptor(Action<InferenceConfigCreateDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public InferenceConfigCreateDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private InferenceConfigCreateDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private InferenceConfigCreateDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -229,6 +230,7 @@ private InferenceConfigCreateDescriptor<TDocument> Set(object variant, string va
 	public InferenceConfigCreateDescriptor<TDocument> TextEmbedding(Action<TextEmbeddingInferenceOptionsDescriptor> configure) => Set(configure, "text_embedding");
 	public InferenceConfigCreateDescriptor<TDocument> ZeroShotClassification(ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => Set(zeroShotClassificationInferenceOptions, "zero_shot_classification");
 	public InferenceConfigCreateDescriptor<TDocument> ZeroShotClassification(Action<ZeroShotClassificationInferenceOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -254,20 +256,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class InferenceConfigCreateDescriptor : SerializableDescriptor<InferenceConfigCreateDescriptor>
 {
 	internal InferenceConfigCreateDescriptor(Action<InferenceConfigCreateDescriptor> configure) => configure.Invoke(this);
+
 	public InferenceConfigCreateDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private InferenceConfigCreateDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private InferenceConfigCreateDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -304,6 +303,7 @@ private InferenceConfigCreateDescriptor Set(object variant, string variantName)
 	public InferenceConfigCreateDescriptor TextEmbedding(Action<TextEmbeddingInferenceOptionsDescriptor> configure) => Set(configure, "text_embedding");
 	public InferenceConfigCreateDescriptor ZeroShotClassification(ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => Set(zeroShotClassificationInferenceOptions, "zero_shot_classification");
 	public InferenceConfigCreateDescriptor ZeroShotClassification(Action<ZeroShotClassificationInferenceOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdate.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdate.g.cs
index a17f473097e..b9e357e9401 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdate.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdate.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 [JsonConverter(typeof(InferenceConfigUpdateConverter))]
 public sealed partial class InferenceConfigUpdate
 {
@@ -41,7 +43,6 @@ internal InferenceConfigUpdate(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static InferenceConfigUpdate Classification(Elastic.Clients.Elasticsearch.Ml.ClassificationInferenceOptions classificationInferenceOptions) => new InferenceConfigUpdate("classification", classificationInferenceOptions);
@@ -180,20 +181,17 @@ public override void Write(Utf8JsonWriter writer, InferenceConfigUpdate value, J
 public sealed partial class InferenceConfigUpdateDescriptor<TDocument> : SerializableDescriptor<InferenceConfigUpdateDescriptor<TDocument>>
 {
 	internal InferenceConfigUpdateDescriptor(Action<InferenceConfigUpdateDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public InferenceConfigUpdateDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private InferenceConfigUpdateDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private InferenceConfigUpdateDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -229,6 +227,7 @@ private InferenceConfigUpdateDescriptor<TDocument> Set(object variant, string va
 	public InferenceConfigUpdateDescriptor<TDocument> TextEmbedding(Action<TextEmbeddingInferenceUpdateOptionsDescriptor> configure) => Set(configure, "text_embedding");
 	public InferenceConfigUpdateDescriptor<TDocument> ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => Set(zeroShotClassificationInferenceUpdateOptions, "zero_shot_classification");
 	public InferenceConfigUpdateDescriptor<TDocument> ZeroShotClassification(Action<ZeroShotClassificationInferenceUpdateOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -254,20 +253,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class InferenceConfigUpdateDescriptor : SerializableDescriptor<InferenceConfigUpdateDescriptor>
 {
 	internal InferenceConfigUpdateDescriptor(Action<InferenceConfigUpdateDescriptor> configure) => configure.Invoke(this);
+
 	public InferenceConfigUpdateDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private InferenceConfigUpdateDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private InferenceConfigUpdateDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -304,6 +300,7 @@ private InferenceConfigUpdateDescriptor Set(object variant, string variantName)
 	public InferenceConfigUpdateDescriptor TextEmbedding(Action<TextEmbeddingInferenceUpdateOptionsDescriptor> configure) => Set(configure, "text_embedding");
 	public InferenceConfigUpdateDescriptor ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => Set(zeroShotClassificationInferenceUpdateOptions, "zero_shot_classification");
 	public InferenceConfigUpdateDescriptor ZeroShotClassification(Action<ZeroShotClassificationInferenceUpdateOptionsDescriptor> configure) => Set(configure, "zero_shot_classification");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceOptions.g.cs
index 7fb7bce9f95..727f58d19e4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,51 +25,72 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
+/// <summary>
+/// <para>Named entity recognition options</para>
+/// </summary>
 public sealed partial class NerInferenceOptions
 {
+	/// <summary>
+	/// <para>The token classification labels. Must be IOB formatted tags</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("classification_labels")]
 	public ICollection<string>? ClassificationLabels { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; }
 
 	public static implicit operator InferenceConfigCreate(NerInferenceOptions nerInferenceOptions) => Ml.InferenceConfigCreate.Ner(nerInferenceOptions);
 }
 
+/// <summary>
+/// <para>Named entity recognition options</para>
+/// </summary>
 public sealed partial class NerInferenceOptionsDescriptor : SerializableDescriptor<NerInferenceOptionsDescriptor>
 {
 	internal NerInferenceOptionsDescriptor(Action<NerInferenceOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public NerInferenceOptionsDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? ClassificationLabelsValue { get; set; }
-
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; }
-
 	private TokenizationConfigDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<TokenizationConfigDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>The token classification labels. Must be IOB formatted tags</para>
+	/// </summary>
 	public NerInferenceOptionsDescriptor ClassificationLabels(ICollection<string>? classificationLabels)
 	{
 		ClassificationLabelsValue = classificationLabels;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public NerInferenceOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options</para>
+	/// </summary>
 	public NerInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceUpdateOptions.g.cs
index c6766e1530e..6447fb5b533 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceUpdateOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NerInferenceUpdateOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 public sealed partial class NerInferenceUpdateOptions
 {
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; }
 
@@ -39,24 +47,28 @@ public sealed partial class NerInferenceUpdateOptions
 public sealed partial class NerInferenceUpdateOptionsDescriptor : SerializableDescriptor<NerInferenceUpdateOptionsDescriptor>
 {
 	internal NerInferenceUpdateOptionsDescriptor(Action<NerInferenceUpdateOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public NerInferenceUpdateOptionsDescriptor() : base()
 	{
 	}
 
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? TokenizationValue { get; set; }
-
 	private NlpTokenizationUpdateOptionsDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<NlpTokenizationUpdateOptionsDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public NerInferenceUpdateOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	public NerInferenceUpdateOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpBertTokenizationConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpBertTokenizationConfig.g.cs
index 0b08e446089..fd1cb9ac301 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpBertTokenizationConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpBertTokenizationConfig.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,67 +25,100 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
+/// <summary>
+/// <para>BERT and MPNet tokenization configuration options</para>
+/// </summary>
 public sealed partial class NlpBertTokenizationConfig
 {
+	/// <summary>
+	/// <para>Should the tokenizer lower case the text</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("do_lower_case")]
 	public bool? DoLowerCase { get; set; }
 
+	/// <summary>
+	/// <para>Maximum input sequence length for the model</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("max_sequence_length")]
 	public int? MaxSequenceLength { get; set; }
 
+	/// <summary>
+	/// <para>Tokenization spanning options. Special value of -1 indicates no spanning takes place</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("span")]
 	public int? Span { get; set; }
 
+	/// <summary>
+	/// <para>Should tokenization input be automatically truncated before sending to the model for inference</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("truncate")]
 	public Elastic.Clients.Elasticsearch.Ml.TokenizationTruncate? Truncate { get; set; }
 
+	/// <summary>
+	/// <para>Is tokenization completed with special tokens</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("with_special_tokens")]
 	public bool? WithSpecialTokens { get; set; }
 }
 
+/// <summary>
+/// <para>BERT and MPNet tokenization configuration options</para>
+/// </summary>
 public sealed partial class NlpBertTokenizationConfigDescriptor : SerializableDescriptor<NlpBertTokenizationConfigDescriptor>
 {
 	internal NlpBertTokenizationConfigDescriptor(Action<NlpBertTokenizationConfigDescriptor> configure) => configure.Invoke(this);
+
 	public NlpBertTokenizationConfigDescriptor() : base()
 	{
 	}
 
 	private bool? DoLowerCaseValue { get; set; }
-
 	private int? MaxSequenceLengthValue { get; set; }
-
 	private int? SpanValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.TokenizationTruncate? TruncateValue { get; set; }
-
 	private bool? WithSpecialTokensValue { get; set; }
 
+	/// <summary>
+	/// <para>Should the tokenizer lower case the text</para>
+	/// </summary>
 	public NlpBertTokenizationConfigDescriptor DoLowerCase(bool? doLowerCase = true)
 	{
 		DoLowerCaseValue = doLowerCase;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Maximum input sequence length for the model</para>
+	/// </summary>
 	public NlpBertTokenizationConfigDescriptor MaxSequenceLength(int? maxSequenceLength)
 	{
 		MaxSequenceLengthValue = maxSequenceLength;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Tokenization spanning options. Special value of -1 indicates no spanning takes place</para>
+	/// </summary>
 	public NlpBertTokenizationConfigDescriptor Span(int? span)
 	{
 		SpanValue = span;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Should tokenization input be automatically truncated before sending to the model for inference</para>
+	/// </summary>
 	public NlpBertTokenizationConfigDescriptor Truncate(Elastic.Clients.Elasticsearch.Ml.TokenizationTruncate? truncate)
 	{
 		TruncateValue = truncate;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Is tokenization completed with special tokens</para>
+	/// </summary>
 	public NlpBertTokenizationConfigDescriptor WithSpecialTokens(bool? withSpecialTokens = true)
 	{
 		WithSpecialTokensValue = withSpecialTokens;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpRobertaTokenizationConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpRobertaTokenizationConfig.g.cs
index 4dbc7c999d3..1419c17110c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpRobertaTokenizationConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpRobertaTokenizationConfig.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,69 +25,102 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
+/// <summary>
+/// <para>RoBERTa tokenization configuration options</para>
+/// </summary>
 public sealed partial class NlpRobertaTokenizationConfig
 {
+	/// <summary>
+	/// <para>Should the tokenizer prefix input with a space character</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("add_prefix_space")]
 	public bool? AddPrefixSpace { get; set; }
 
+	/// <summary>
+	/// <para>Maximum input sequence length for the model</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("max_sequence_length")]
 	public int? MaxSequenceLength { get; set; }
 
+	/// <summary>
+	/// <para>Tokenization spanning options. Special value of -1 indicates no spanning takes place</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("span")]
 	public int? Span { get; set; }
 
+	/// <summary>
+	/// <para>Should tokenization input be automatically truncated before sending to the model for inference</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("truncate")]
 	public Elastic.Clients.Elasticsearch.Ml.TokenizationTruncate? Truncate { get; set; }
 
+	/// <summary>
+	/// <para>Is tokenization completed with special tokens</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("with_special_tokens")]
 	public bool? WithSpecialTokens { get; set; }
 
 	public static implicit operator TokenizationConfig(NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => Ml.TokenizationConfig.Roberta(nlpRobertaTokenizationConfig);
 }
 
+/// <summary>
+/// <para>RoBERTa tokenization configuration options</para>
+/// </summary>
 public sealed partial class NlpRobertaTokenizationConfigDescriptor : SerializableDescriptor<NlpRobertaTokenizationConfigDescriptor>
 {
 	internal NlpRobertaTokenizationConfigDescriptor(Action<NlpRobertaTokenizationConfigDescriptor> configure) => configure.Invoke(this);
+
 	public NlpRobertaTokenizationConfigDescriptor() : base()
 	{
 	}
 
 	private bool? AddPrefixSpaceValue { get; set; }
-
 	private int? MaxSequenceLengthValue { get; set; }
-
 	private int? SpanValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.TokenizationTruncate? TruncateValue { get; set; }
-
 	private bool? WithSpecialTokensValue { get; set; }
 
+	/// <summary>
+	/// <para>Should the tokenizer prefix input with a space character</para>
+	/// </summary>
 	public NlpRobertaTokenizationConfigDescriptor AddPrefixSpace(bool? addPrefixSpace = true)
 	{
 		AddPrefixSpaceValue = addPrefixSpace;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Maximum input sequence length for the model</para>
+	/// </summary>
 	public NlpRobertaTokenizationConfigDescriptor MaxSequenceLength(int? maxSequenceLength)
 	{
 		MaxSequenceLengthValue = maxSequenceLength;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Tokenization spanning options. Special value of -1 indicates no spanning takes place</para>
+	/// </summary>
 	public NlpRobertaTokenizationConfigDescriptor Span(int? span)
 	{
 		SpanValue = span;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Should tokenization input be automatically truncated before sending to the model for inference</para>
+	/// </summary>
 	public NlpRobertaTokenizationConfigDescriptor Truncate(Elastic.Clients.Elasticsearch.Ml.TokenizationTruncate? truncate)
 	{
 		TruncateValue = truncate;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Is tokenization completed with special tokens</para>
+	/// </summary>
 	public NlpRobertaTokenizationConfigDescriptor WithSpecialTokens(bool? withSpecialTokens = true)
 	{
 		WithSpecialTokensValue = withSpecialTokens;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpTokenizationUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpTokenizationUpdateOptions.g.cs
index d0d93e68b57..86a105180f2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpTokenizationUpdateOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/NlpTokenizationUpdateOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 public sealed partial class NlpTokenizationUpdateOptions
 {
+	/// <summary>
+	/// <para>Span options to apply</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("span")]
 	public int? Span { get; set; }
 
+	/// <summary>
+	/// <para>Truncate options to apply</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("truncate")]
 	public Elastic.Clients.Elasticsearch.Ml.TokenizationTruncate? Truncate { get; set; }
 }
@@ -37,20 +45,26 @@ public sealed partial class NlpTokenizationUpdateOptions
 public sealed partial class NlpTokenizationUpdateOptionsDescriptor : SerializableDescriptor<NlpTokenizationUpdateOptionsDescriptor>
 {
 	internal NlpTokenizationUpdateOptionsDescriptor(Action<NlpTokenizationUpdateOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public NlpTokenizationUpdateOptionsDescriptor() : base()
 	{
 	}
 
 	private int? SpanValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.TokenizationTruncate? TruncateValue { get; set; }
 
+	/// <summary>
+	/// <para>Span options to apply</para>
+	/// </summary>
 	public NlpTokenizationUpdateOptionsDescriptor Span(int? span)
 	{
 		SpanValue = span;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Truncate options to apply</para>
+	/// </summary>
 	public NlpTokenizationUpdateOptionsDescriptor Truncate(Elastic.Clients.Elasticsearch.Ml.TokenizationTruncate? truncate)
 	{
 		TruncateValue = truncate;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceOptions.g.cs
index dddc95c75d3..c08e0c93d3f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,40 +25,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
+/// <summary>
+/// <para>Pass through configuration options</para>
+/// </summary>
 public sealed partial class PassThroughInferenceOptions
 {
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; }
 
 	public static implicit operator InferenceConfigCreate(PassThroughInferenceOptions passThroughInferenceOptions) => Ml.InferenceConfigCreate.PassThrough(passThroughInferenceOptions);
 }
 
+/// <summary>
+/// <para>Pass through configuration options</para>
+/// </summary>
 public sealed partial class PassThroughInferenceOptionsDescriptor : SerializableDescriptor<PassThroughInferenceOptionsDescriptor>
 {
 	internal PassThroughInferenceOptionsDescriptor(Action<PassThroughInferenceOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public PassThroughInferenceOptionsDescriptor() : base()
 	{
 	}
 
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; }
-
 	private TokenizationConfigDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<TokenizationConfigDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public PassThroughInferenceOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options</para>
+	/// </summary>
 	public PassThroughInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceUpdateOptions.g.cs
index 73f74dc758d..dd998a46ef2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceUpdateOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/PassThroughInferenceUpdateOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 public sealed partial class PassThroughInferenceUpdateOptions
 {
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; }
 
@@ -39,24 +47,28 @@ public sealed partial class PassThroughInferenceUpdateOptions
 public sealed partial class PassThroughInferenceUpdateOptionsDescriptor : SerializableDescriptor<PassThroughInferenceUpdateOptionsDescriptor>
 {
 	internal PassThroughInferenceUpdateOptionsDescriptor(Action<PassThroughInferenceUpdateOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public PassThroughInferenceUpdateOptionsDescriptor() : base()
 	{
 	}
 
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? TokenizationValue { get; set; }
-
 	private NlpTokenizationUpdateOptionsDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<NlpTokenizationUpdateOptionsDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public PassThroughInferenceUpdateOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	public PassThroughInferenceUpdateOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceOptions.g.cs
index 2a62e2a22f1..c77ee61165f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,62 +25,88 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
+/// <summary>
+/// <para>Question answering inference options</para>
+/// </summary>
 public sealed partial class QuestionAnsweringInferenceOptions
 {
+	/// <summary>
+	/// <para>The maximum answer length to consider</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("max_answer_length")]
 	public int? MaxAnswerLength { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("num_top_classes")]
 	public int? NumTopClasses { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; }
 
 	public static implicit operator InferenceConfigCreate(QuestionAnsweringInferenceOptions questionAnsweringInferenceOptions) => Ml.InferenceConfigCreate.QuestionAnswering(questionAnsweringInferenceOptions);
 }
 
+/// <summary>
+/// <para>Question answering inference options</para>
+/// </summary>
 public sealed partial class QuestionAnsweringInferenceOptionsDescriptor : SerializableDescriptor<QuestionAnsweringInferenceOptionsDescriptor>
 {
 	internal QuestionAnsweringInferenceOptionsDescriptor(Action<QuestionAnsweringInferenceOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public QuestionAnsweringInferenceOptionsDescriptor() : base()
 	{
 	}
 
 	private int? MaxAnswerLengthValue { get; set; }
-
 	private int? NumTopClassesValue { get; set; }
-
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; }
-
 	private TokenizationConfigDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<TokenizationConfigDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>The maximum answer length to consider</para>
+	/// </summary>
 	public QuestionAnsweringInferenceOptionsDescriptor MaxAnswerLength(int? maxAnswerLength)
 	{
 		MaxAnswerLengthValue = maxAnswerLength;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	public QuestionAnsweringInferenceOptionsDescriptor NumTopClasses(int? numTopClasses)
 	{
 		NumTopClassesValue = numTopClasses;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public QuestionAnsweringInferenceOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	public QuestionAnsweringInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceUpdateOptions.g.cs
index acb7dfe02e0..50f6bffa09a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceUpdateOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/QuestionAnsweringInferenceUpdateOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,37 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 public sealed partial class QuestionAnsweringInferenceUpdateOptions
 {
+	/// <summary>
+	/// <para>The maximum answer length to consider for extraction</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("max_answer_length")]
 	public int? MaxAnswerLength { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("num_top_classes")]
 	public int? NumTopClasses { get; set; }
 
+	/// <summary>
+	/// <para>The question to answer given the inference context</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("question")]
 	public string Question { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; }
 
@@ -48,48 +65,58 @@ public sealed partial class QuestionAnsweringInferenceUpdateOptions
 public sealed partial class QuestionAnsweringInferenceUpdateOptionsDescriptor : SerializableDescriptor<QuestionAnsweringInferenceUpdateOptionsDescriptor>
 {
 	internal QuestionAnsweringInferenceUpdateOptionsDescriptor(Action<QuestionAnsweringInferenceUpdateOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public QuestionAnsweringInferenceUpdateOptionsDescriptor() : base()
 	{
 	}
 
 	private int? MaxAnswerLengthValue { get; set; }
-
 	private int? NumTopClassesValue { get; set; }
-
 	private string QuestionValue { get; set; }
-
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? TokenizationValue { get; set; }
-
 	private NlpTokenizationUpdateOptionsDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<NlpTokenizationUpdateOptionsDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>The maximum answer length to consider for extraction</para>
+	/// </summary>
 	public QuestionAnsweringInferenceUpdateOptionsDescriptor MaxAnswerLength(int? maxAnswerLength)
 	{
 		MaxAnswerLengthValue = maxAnswerLength;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	public QuestionAnsweringInferenceUpdateOptionsDescriptor NumTopClasses(int? numTopClasses)
 	{
 		NumTopClassesValue = numTopClasses;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The question to answer given the inference context</para>
+	/// </summary>
 	public QuestionAnsweringInferenceUpdateOptionsDescriptor Question(string question)
 	{
 		QuestionValue = question;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public QuestionAnsweringInferenceUpdateOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	public QuestionAnsweringInferenceUpdateOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/RegressionInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/RegressionInferenceOptions.g.cs
index 471fe67d24e..b70c3ff18d4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/RegressionInferenceOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/RegressionInferenceOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,19 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 public sealed partial class RegressionInferenceOptions
 {
+	/// <summary>
+	/// <para>Specifies the maximum number of feature importance values per document.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("num_top_feature_importance_values")]
 	public int? NumTopFeatureImportanceValues { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public Elastic.Clients.Elasticsearch.Field? ResultsField { get; set; }
 }
@@ -37,26 +45,35 @@ public sealed partial class RegressionInferenceOptions
 public sealed partial class RegressionInferenceOptionsDescriptor<TDocument> : SerializableDescriptor<RegressionInferenceOptionsDescriptor<TDocument>>
 {
 	internal RegressionInferenceOptionsDescriptor(Action<RegressionInferenceOptionsDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RegressionInferenceOptionsDescriptor() : base()
 	{
 	}
 
 	private int? NumTopFeatureImportanceValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? ResultsFieldValue { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the maximum number of feature importance values per document.</para>
+	/// </summary>
 	public RegressionInferenceOptionsDescriptor<TDocument> NumTopFeatureImportanceValues(int? numTopFeatureImportanceValues)
 	{
 		NumTopFeatureImportanceValuesValue = numTopFeatureImportanceValues;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public RegressionInferenceOptionsDescriptor<TDocument> ResultsField(Elastic.Clients.Elasticsearch.Field? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public RegressionInferenceOptionsDescriptor<TDocument> ResultsField<TValue>(Expression<Func<TDocument, TValue>> resultsField)
 	{
 		ResultsFieldValue = resultsField;
@@ -85,32 +102,44 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RegressionInferenceOptionsDescriptor : SerializableDescriptor<RegressionInferenceOptionsDescriptor>
 {
 	internal RegressionInferenceOptionsDescriptor(Action<RegressionInferenceOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public RegressionInferenceOptionsDescriptor() : base()
 	{
 	}
 
 	private int? NumTopFeatureImportanceValuesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? ResultsFieldValue { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the maximum number of feature importance values per document.</para>
+	/// </summary>
 	public RegressionInferenceOptionsDescriptor NumTopFeatureImportanceValues(int? numTopFeatureImportanceValues)
 	{
 		NumTopFeatureImportanceValuesValue = numTopFeatureImportanceValues;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public RegressionInferenceOptionsDescriptor ResultsField(Elastic.Clients.Elasticsearch.Field? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public RegressionInferenceOptionsDescriptor ResultsField<TDocument, TValue>(Expression<Func<TDocument, TValue>> resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public RegressionInferenceOptionsDescriptor ResultsField<TDocument>(Expression<Func<TDocument, object>> resultsField)
 	{
 		ResultsFieldValue = resultsField;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceOptions.g.cs
index 5a5805fe1fb..0038dc406c1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,62 +25,88 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
+/// <summary>
+/// <para>Text classification configuration options</para>
+/// </summary>
 public sealed partial class TextClassificationInferenceOptions
 {
+	/// <summary>
+	/// <para>Classification labels to apply other than the stored labels. Must have the same deminsions as the default configured labels</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("classification_labels")]
 	public ICollection<string>? ClassificationLabels { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("num_top_classes")]
 	public int? NumTopClasses { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; }
 
 	public static implicit operator InferenceConfigCreate(TextClassificationInferenceOptions textClassificationInferenceOptions) => Ml.InferenceConfigCreate.TextClassification(textClassificationInferenceOptions);
 }
 
+/// <summary>
+/// <para>Text classification configuration options</para>
+/// </summary>
 public sealed partial class TextClassificationInferenceOptionsDescriptor : SerializableDescriptor<TextClassificationInferenceOptionsDescriptor>
 {
 	internal TextClassificationInferenceOptionsDescriptor(Action<TextClassificationInferenceOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public TextClassificationInferenceOptionsDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? ClassificationLabelsValue { get; set; }
-
 	private int? NumTopClassesValue { get; set; }
-
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; }
-
 	private TokenizationConfigDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<TokenizationConfigDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>Classification labels to apply other than the stored labels. Must have the same deminsions as the default configured labels</para>
+	/// </summary>
 	public TextClassificationInferenceOptionsDescriptor ClassificationLabels(ICollection<string>? classificationLabels)
 	{
 		ClassificationLabelsValue = classificationLabels;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	public TextClassificationInferenceOptionsDescriptor NumTopClasses(int? numTopClasses)
 	{
 		NumTopClassesValue = numTopClasses;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public TextClassificationInferenceOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options</para>
+	/// </summary>
 	public TextClassificationInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceUpdateOptions.g.cs
index f6982ac2fc9..d422767afbf 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceUpdateOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextClassificationInferenceUpdateOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,31 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 public sealed partial class TextClassificationInferenceUpdateOptions
 {
+	/// <summary>
+	/// <para>Classification labels to apply other than the stored labels. Must have the same deminsions as the default configured labels</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("classification_labels")]
 	public ICollection<string>? ClassificationLabels { get; set; }
 
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("num_top_classes")]
 	public int? NumTopClasses { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; }
 
@@ -45,40 +59,48 @@ public sealed partial class TextClassificationInferenceUpdateOptions
 public sealed partial class TextClassificationInferenceUpdateOptionsDescriptor : SerializableDescriptor<TextClassificationInferenceUpdateOptionsDescriptor>
 {
 	internal TextClassificationInferenceUpdateOptionsDescriptor(Action<TextClassificationInferenceUpdateOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public TextClassificationInferenceUpdateOptionsDescriptor() : base()
 	{
 	}
 
 	private ICollection<string>? ClassificationLabelsValue { get; set; }
-
 	private int? NumTopClassesValue { get; set; }
-
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? TokenizationValue { get; set; }
-
 	private NlpTokenizationUpdateOptionsDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<NlpTokenizationUpdateOptionsDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>Classification labels to apply other than the stored labels. Must have the same deminsions as the default configured labels</para>
+	/// </summary>
 	public TextClassificationInferenceUpdateOptionsDescriptor ClassificationLabels(ICollection<string>? classificationLabels)
 	{
 		ClassificationLabelsValue = classificationLabels;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Specifies the number of top class predictions to return. Defaults to 0.</para>
+	/// </summary>
 	public TextClassificationInferenceUpdateOptionsDescriptor NumTopClasses(int? numTopClasses)
 	{
 		NumTopClassesValue = numTopClasses;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public TextClassificationInferenceUpdateOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	public TextClassificationInferenceUpdateOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceOptions.g.cs
index fc696785f47..61ab5606bcb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,40 +25,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
+/// <summary>
+/// <para>Text embedding inference options</para>
+/// </summary>
 public sealed partial class TextEmbeddingInferenceOptions
 {
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; }
 
 	public static implicit operator InferenceConfigCreate(TextEmbeddingInferenceOptions textEmbeddingInferenceOptions) => Ml.InferenceConfigCreate.TextEmbedding(textEmbeddingInferenceOptions);
 }
 
+/// <summary>
+/// <para>Text embedding inference options</para>
+/// </summary>
 public sealed partial class TextEmbeddingInferenceOptionsDescriptor : SerializableDescriptor<TextEmbeddingInferenceOptionsDescriptor>
 {
 	internal TextEmbeddingInferenceOptionsDescriptor(Action<TextEmbeddingInferenceOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public TextEmbeddingInferenceOptionsDescriptor() : base()
 	{
 	}
 
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; }
-
 	private TokenizationConfigDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<TokenizationConfigDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public TextEmbeddingInferenceOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options</para>
+	/// </summary>
 	public TextEmbeddingInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceUpdateOptions.g.cs
index 8c2129eece9..2c38b23abc0 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceUpdateOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TextEmbeddingInferenceUpdateOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,15 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 public sealed partial class TextEmbeddingInferenceUpdateOptions
 {
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
-
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; }
 
@@ -39,18 +43,19 @@ public sealed partial class TextEmbeddingInferenceUpdateOptions
 public sealed partial class TextEmbeddingInferenceUpdateOptionsDescriptor : SerializableDescriptor<TextEmbeddingInferenceUpdateOptionsDescriptor>
 {
 	internal TextEmbeddingInferenceUpdateOptionsDescriptor(Action<TextEmbeddingInferenceUpdateOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public TextEmbeddingInferenceUpdateOptionsDescriptor() : base()
 	{
 	}
 
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? TokenizationValue { get; set; }
-
 	private NlpTokenizationUpdateOptionsDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<NlpTokenizationUpdateOptionsDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public TextEmbeddingInferenceUpdateOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfig.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfig.g.cs
index ecbd06c1c97..441a221f9e2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfig.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfig.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,9 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 [JsonConverter(typeof(TokenizationConfigConverter))]
+/// <summary>
+/// <para>Tokenization options stored in inference configuration</para>
+/// </summary>
 public sealed partial class TokenizationConfig
 {
 	internal TokenizationConfig(string variantName, object variant)
@@ -41,7 +46,6 @@ internal TokenizationConfig(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static TokenizationConfig Bert(Elastic.Clients.Elasticsearch.Ml.NlpBertTokenizationConfig nlpBertTokenizationConfig) => new TokenizationConfig("bert", nlpBertTokenizationConfig);
@@ -114,20 +118,17 @@ public override void Write(Utf8JsonWriter writer, TokenizationConfig value, Json
 public sealed partial class TokenizationConfigDescriptor<TDocument> : SerializableDescriptor<TokenizationConfigDescriptor<TDocument>>
 {
 	internal TokenizationConfigDescriptor(Action<TokenizationConfigDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TokenizationConfigDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private TokenizationConfigDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private TokenizationConfigDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -151,6 +152,7 @@ private TokenizationConfigDescriptor<TDocument> Set(object variant, string varia
 	public TokenizationConfigDescriptor<TDocument> Mpnet(Action<NlpBertTokenizationConfigDescriptor> configure) => Set(configure, "mpnet");
 	public TokenizationConfigDescriptor<TDocument> Roberta(NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => Set(nlpRobertaTokenizationConfig, "roberta");
 	public TokenizationConfigDescriptor<TDocument> Roberta(Action<NlpRobertaTokenizationConfigDescriptor> configure) => Set(configure, "roberta");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -176,20 +178,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TokenizationConfigDescriptor : SerializableDescriptor<TokenizationConfigDescriptor>
 {
 	internal TokenizationConfigDescriptor(Action<TokenizationConfigDescriptor> configure) => configure.Invoke(this);
+
 	public TokenizationConfigDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private TokenizationConfigDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private TokenizationConfigDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -213,6 +212,7 @@ private TokenizationConfigDescriptor Set(object variant, string variantName)
 	public TokenizationConfigDescriptor Mpnet(Action<NlpBertTokenizationConfigDescriptor> configure) => Set(configure, "mpnet");
 	public TokenizationConfigDescriptor Roberta(NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => Set(nlpRobertaTokenizationConfig, "roberta");
 	public TokenizationConfigDescriptor Roberta(Action<NlpRobertaTokenizationConfigDescriptor> configure) => Set(configure, "roberta");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceOptions.g.cs
index 9b5043ebd78..59439debe2d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,84 +25,120 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
+/// <summary>
+/// <para>Zero shot classification configuration options</para>
+/// </summary>
 public sealed partial class ZeroShotClassificationInferenceOptions
 {
+	/// <summary>
+	/// <para>The zero shot classification labels indicating entailment, neutral, and contradiction<br/>Must contain exactly and only entailment, neutral, and contradiction</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("classification_labels")]
 	public ICollection<string> ClassificationLabels { get; set; }
 
+	/// <summary>
+	/// <para>Hypothesis template used when tokenizing labels for prediction</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("hypothesis_template")]
 	public string? HypothesisTemplate { get; set; }
 
+	/// <summary>
+	/// <para>The labels to predict.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("labels")]
 	public ICollection<string>? Labels { get; set; }
 
+	/// <summary>
+	/// <para>Indicates if more than one true label exists.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("multi_label")]
 	public bool? MultiLabel { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? Tokenization { get; set; }
 
 	public static implicit operator InferenceConfigCreate(ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => Ml.InferenceConfigCreate.ZeroShotClassification(zeroShotClassificationInferenceOptions);
 }
 
+/// <summary>
+/// <para>Zero shot classification configuration options</para>
+/// </summary>
 public sealed partial class ZeroShotClassificationInferenceOptionsDescriptor : SerializableDescriptor<ZeroShotClassificationInferenceOptionsDescriptor>
 {
 	internal ZeroShotClassificationInferenceOptionsDescriptor(Action<ZeroShotClassificationInferenceOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public ZeroShotClassificationInferenceOptionsDescriptor() : base()
 	{
 	}
 
 	private ICollection<string> ClassificationLabelsValue { get; set; }
-
 	private string? HypothesisTemplateValue { get; set; }
-
 	private ICollection<string>? LabelsValue { get; set; }
-
 	private bool? MultiLabelValue { get; set; }
-
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? TokenizationValue { get; set; }
-
 	private TokenizationConfigDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<TokenizationConfigDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>The zero shot classification labels indicating entailment, neutral, and contradiction<br/>Must contain exactly and only entailment, neutral, and contradiction</para>
+	/// </summary>
 	public ZeroShotClassificationInferenceOptionsDescriptor ClassificationLabels(ICollection<string> classificationLabels)
 	{
 		ClassificationLabelsValue = classificationLabels;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Hypothesis template used when tokenizing labels for prediction</para>
+	/// </summary>
 	public ZeroShotClassificationInferenceOptionsDescriptor HypothesisTemplate(string? hypothesisTemplate)
 	{
 		HypothesisTemplateValue = hypothesisTemplate;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The labels to predict.</para>
+	/// </summary>
 	public ZeroShotClassificationInferenceOptionsDescriptor Labels(ICollection<string>? labels)
 	{
 		LabelsValue = labels;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Indicates if more than one true label exists.</para>
+	/// </summary>
 	public ZeroShotClassificationInferenceOptionsDescriptor MultiLabel(bool? multiLabel = true)
 	{
 		MultiLabelValue = multiLabel;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public ZeroShotClassificationInferenceOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	public ZeroShotClassificationInferenceOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.TokenizationConfig? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceUpdateOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceUpdateOptions.g.cs
index 0c8290f1b9e..da2974e61ae 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceUpdateOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/ZeroShotClassificationInferenceUpdateOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,31 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Ml;
+
 public sealed partial class ZeroShotClassificationInferenceUpdateOptions
 {
+	/// <summary>
+	/// <para>The labels to predict.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("labels")]
 	public ICollection<string> Labels { get; set; }
 
+	/// <summary>
+	/// <para>Update the configured multi label option. Indicates if more than one true label exists. Defaults to the configured value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("multi_label")]
 	public bool? MultiLabel { get; set; }
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("results_field")]
 	public string? ResultsField { get; set; }
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("tokenization")]
 	public Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? Tokenization { get; set; }
 
@@ -45,40 +59,48 @@ public sealed partial class ZeroShotClassificationInferenceUpdateOptions
 public sealed partial class ZeroShotClassificationInferenceUpdateOptionsDescriptor : SerializableDescriptor<ZeroShotClassificationInferenceUpdateOptionsDescriptor>
 {
 	internal ZeroShotClassificationInferenceUpdateOptionsDescriptor(Action<ZeroShotClassificationInferenceUpdateOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public ZeroShotClassificationInferenceUpdateOptionsDescriptor() : base()
 	{
 	}
 
 	private ICollection<string> LabelsValue { get; set; }
-
 	private bool? MultiLabelValue { get; set; }
-
 	private string? ResultsFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? TokenizationValue { get; set; }
-
 	private NlpTokenizationUpdateOptionsDescriptor TokenizationDescriptor { get; set; }
-
 	private Action<NlpTokenizationUpdateOptionsDescriptor> TokenizationDescriptorAction { get; set; }
 
+	/// <summary>
+	/// <para>The labels to predict.</para>
+	/// </summary>
 	public ZeroShotClassificationInferenceUpdateOptionsDescriptor Labels(ICollection<string> labels)
 	{
 		LabelsValue = labels;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Update the configured multi label option. Indicates if more than one true label exists. Defaults to the configured value.</para>
+	/// </summary>
 	public ZeroShotClassificationInferenceUpdateOptionsDescriptor MultiLabel(bool? multiLabel = true)
 	{
 		MultiLabelValue = multiLabel;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The field that is added to incoming documents to contain the inference prediction. Defaults to predicted_value.</para>
+	/// </summary>
 	public ZeroShotClassificationInferenceUpdateOptionsDescriptor ResultsField(string? resultsField)
 	{
 		ResultsFieldValue = resultsField;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>The tokenization options to update when inferring</para>
+	/// </summary>
 	public ZeroShotClassificationInferenceUpdateOptionsDescriptor Tokenization(Elastic.Clients.Elasticsearch.Ml.NlpTokenizationUpdateOptions? tokenization)
 	{
 		TokenizationDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/NestedSortValue.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/NestedSortValue.g.cs
index 26c86ff9e95..d9e960b0fb4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/NestedSortValue.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/NestedSortValue.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class NestedSortValue
 {
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_children")]
 	public int? MaxChildren { get; set; }
-
 	[JsonInclude, JsonPropertyName("nested")]
 	public Elastic.Clients.Elasticsearch.NestedSortValue? Nested { get; set; }
-
 	[JsonInclude, JsonPropertyName("path")]
 	public Elastic.Clients.Elasticsearch.Field Path { get; set; }
 }
@@ -43,24 +42,18 @@ public sealed partial class NestedSortValue
 public sealed partial class NestedSortValueDescriptor<TDocument> : SerializableDescriptor<NestedSortValueDescriptor<TDocument>>
 {
 	internal NestedSortValueDescriptor(Action<NestedSortValueDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public NestedSortValueDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.NestedSortValue? NestedValue { get; set; }
-
 	private NestedSortValueDescriptor<TDocument> NestedDescriptor { get; set; }
-
 	private Action<NestedSortValueDescriptor<TDocument>> NestedDescriptorAction { get; set; }
-
 	private int? MaxChildrenValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field PathValue { get; set; }
 
 	public NestedSortValueDescriptor<TDocument> Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
@@ -179,24 +172,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class NestedSortValueDescriptor : SerializableDescriptor<NestedSortValueDescriptor>
 {
 	internal NestedSortValueDescriptor(Action<NestedSortValueDescriptor> configure) => configure.Invoke(this);
+
 	public NestedSortValueDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDsl.QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDsl.QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.NestedSortValue? NestedValue { get; set; }
-
 	private NestedSortValueDescriptor NestedDescriptor { get; set; }
-
 	private Action<NestedSortValueDescriptor> NestedDescriptorAction { get; set; }
-
 	private int? MaxChildrenValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field PathValue { get; set; }
 
 	public NestedSortValueDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/NodeAttributes.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/NodeAttributes.g.cs
index 2464d4403eb..9fc74dabad5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/NodeAttributes.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/NodeAttributes.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,41 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class NodeAttributes
 {
+	/// <summary>
+	/// <para>Lists node attributes.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("attributes")]
 	public IReadOnlyDictionary<string, string> Attributes { get; init; }
 
+	/// <summary>
+	/// <para>The ephemeral ID of the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("ephemeral_id")]
 	public string EphemeralId { get; init; }
-
 	[JsonInclude, JsonPropertyName("external_id")]
 	public string ExternalId { get; init; }
 
+	/// <summary>
+	/// <para>The unique identifier of the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("id")]
 	public string? Id { get; init; }
 
+	/// <summary>
+	/// <para>The unique identifier of the node.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-
 	[JsonInclude, JsonPropertyName("roles")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.NodeRole>? Roles { get; init; }
 
+	/// <summary>
+	/// <para>The host and port where transport HTTP connections are accepted.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("transport_address")]
 	public string TransportAddress { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/NodeShard.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/NodeShard.g.cs
index 7b2b42e512c..344c0a7465e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/NodeShard.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/NodeShard.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class NodeShard
 {
 	[JsonInclude, JsonPropertyName("allocation_id")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Id>? AllocationId { get; init; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public string Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("node")]
 	public string? Node { get; init; }
-
 	[JsonInclude, JsonPropertyName("primary")]
 	public bool Primary { get; init; }
-
 	[JsonInclude, JsonPropertyName("recovery_source")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Id>? RecoverySource { get; init; }
-
 	[JsonInclude, JsonPropertyName("relocating_node")]
 	public string? RelocatingNode { get; init; }
-
 	[JsonInclude, JsonPropertyName("shard")]
 	public int Shard { get; init; }
-
 	[JsonInclude, JsonPropertyName("state")]
 	public Elastic.Clients.Elasticsearch.IndexManagement.ShardRoutingState State { get; init; }
-
 	[JsonInclude, JsonPropertyName("unassigned_info")]
 	public Elastic.Clients.Elasticsearch.Cluster.UnassignedInformation? UnassignedInfo { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryCacheStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryCacheStats.g.cs
index 38c86fde7af..b1b8c3b9539 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryCacheStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryCacheStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class QueryCacheStats
 {
 	[JsonInclude, JsonPropertyName("cache_count")]
 	public int CacheCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("cache_size")]
 	public int CacheSize { get; init; }
-
 	[JsonInclude, JsonPropertyName("evictions")]
 	public int Evictions { get; init; }
-
 	[JsonInclude, JsonPropertyName("hit_count")]
 	public int HitCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("memory_size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? MemorySize { get; init; }
-
 	[JsonInclude, JsonPropertyName("memory_size_in_bytes")]
 	public int MemorySizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("miss_count")]
 	public int MissCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_count")]
 	public int TotalCount { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs
index 9d086048d18..6ed8e499ff5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class BoolQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("filter"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
-
 	[JsonInclude, JsonPropertyName("must"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Must { get; set; }
-
 	[JsonInclude, JsonPropertyName("must_not"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? MustNot { get; set; }
-
 	[JsonInclude, JsonPropertyName("should"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Query))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? Should { get; set; }
 
@@ -54,46 +50,29 @@ public sealed partial class BoolQuery : SearchQuery
 public sealed partial class BoolQueryDescriptor<TDocument> : SerializableDescriptor<BoolQueryDescriptor<TDocument>>
 {
 	internal BoolQueryDescriptor(Action<BoolQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public BoolQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? FilterValue { get; set; }
-
 	private QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private Action<QueryDescriptor<TDocument>>[] FilterDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? MustValue { get; set; }
-
 	private QueryDescriptor<TDocument> MustDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> MustDescriptorAction { get; set; }
-
 	private Action<QueryDescriptor<TDocument>>[] MustDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? MustNotValue { get; set; }
-
 	private QueryDescriptor<TDocument> MustNotDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> MustNotDescriptorAction { get; set; }
-
 	private Action<QueryDescriptor<TDocument>>[] MustNotDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? ShouldValue { get; set; }
-
 	private QueryDescriptor<TDocument> ShouldDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> ShouldDescriptorAction { get; set; }
-
 	private Action<QueryDescriptor<TDocument>>[] ShouldDescriptorActions { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
 
 	public BoolQueryDescriptor<TDocument> Filter(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? filter)
@@ -402,46 +381,29 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class BoolQueryDescriptor : SerializableDescriptor<BoolQueryDescriptor>
 {
 	internal BoolQueryDescriptor(Action<BoolQueryDescriptor> configure) => configure.Invoke(this);
+
 	public BoolQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? FilterValue { get; set; }
-
 	private QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private Action<QueryDescriptor>[] FilterDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? MustValue { get; set; }
-
 	private QueryDescriptor MustDescriptor { get; set; }
-
 	private Action<QueryDescriptor> MustDescriptorAction { get; set; }
-
 	private Action<QueryDescriptor>[] MustDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? MustNotValue { get; set; }
-
 	private QueryDescriptor MustNotDescriptor { get; set; }
-
 	private Action<QueryDescriptor> MustNotDescriptorAction { get; set; }
-
 	private Action<QueryDescriptor>[] MustNotDescriptorActions { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? ShouldValue { get; set; }
-
 	private QueryDescriptor ShouldDescriptor { get; set; }
-
 	private Action<QueryDescriptor> ShouldDescriptorAction { get; set; }
-
 	private Action<QueryDescriptor>[] ShouldDescriptorActions { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
 
 	public BoolQueryDescriptor Filter(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query>? filter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoostingQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoostingQuery.g.cs
index cd3d1b74b04..49e0ea9bbef 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoostingQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoostingQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class BoostingQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("negative")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Negative { get; set; }
-
 	[JsonInclude, JsonPropertyName("negative_boost")]
 	public double NegativeBoost { get; set; }
-
 	[JsonInclude, JsonPropertyName("positive")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Positive { get; set; }
 
@@ -48,26 +46,19 @@ public sealed partial class BoostingQuery : SearchQuery
 public sealed partial class BoostingQueryDescriptor<TDocument> : SerializableDescriptor<BoostingQueryDescriptor<TDocument>>
 {
 	internal BoostingQueryDescriptor(Action<BoostingQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public BoostingQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query NegativeValue { get; set; }
-
 	private QueryDescriptor<TDocument> NegativeDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> NegativeDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query PositiveValue { get; set; }
-
 	private QueryDescriptor<TDocument> PositiveDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> PositiveDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private double NegativeBoostValue { get; set; }
 
 	public BoostingQueryDescriptor<TDocument> Negative(Elastic.Clients.Elasticsearch.QueryDsl.Query negative)
@@ -192,26 +183,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class BoostingQueryDescriptor : SerializableDescriptor<BoostingQueryDescriptor>
 {
 	internal BoostingQueryDescriptor(Action<BoostingQueryDescriptor> configure) => configure.Invoke(this);
+
 	public BoostingQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query NegativeValue { get; set; }
-
 	private QueryDescriptor NegativeDescriptor { get; set; }
-
 	private Action<QueryDescriptor> NegativeDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query PositiveValue { get; set; }
-
 	private QueryDescriptor PositiveDescriptor { get; set; }
-
 	private Action<QueryDescriptor> PositiveDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private double NegativeBoostValue { get; set; }
 
 	public BoostingQueryDescriptor Negative(Elastic.Clients.Elasticsearch.QueryDsl.Query negative)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs
index 5f8caa0d79f..e5962e1d278 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/CombinedFieldsQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class CombinedFieldsQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Fields Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
-
 	[JsonInclude, JsonPropertyName("operator")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsOperator? Operator { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("zero_terms_query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsZeroTerms? ZeroTermsQuery { get; set; }
 
@@ -57,24 +52,18 @@ public sealed partial class CombinedFieldsQuery : SearchQuery
 public sealed partial class CombinedFieldsQueryDescriptor<TDocument> : SerializableDescriptor<CombinedFieldsQueryDescriptor<TDocument>>
 {
 	internal CombinedFieldsQueryDescriptor(Action<CombinedFieldsQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public CombinedFieldsQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private bool? AutoGenerateSynonymsPhraseQueryValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Fields FieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsOperator? OperatorValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsZeroTerms? ZeroTermsQueryValue { get; set; }
 
 	public CombinedFieldsQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -175,24 +164,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class CombinedFieldsQueryDescriptor : SerializableDescriptor<CombinedFieldsQueryDescriptor>
 {
 	internal CombinedFieldsQueryDescriptor(Action<CombinedFieldsQueryDescriptor> configure) => configure.Invoke(this);
+
 	public CombinedFieldsQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private bool? AutoGenerateSynonymsPhraseQueryValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Fields FieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsOperator? OperatorValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.CombinedFieldsZeroTerms? ZeroTermsQueryValue { get; set; }
 
 	public CombinedFieldsQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ConstantScoreQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ConstantScoreQuery.g.cs
index 1ab936b7e32..fbed7ca01c9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ConstantScoreQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ConstantScoreQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class ConstantScoreQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Filter { get; set; }
 
@@ -42,18 +42,15 @@ public sealed partial class ConstantScoreQuery : SearchQuery
 public sealed partial class ConstantScoreQueryDescriptor<TDocument> : SerializableDescriptor<ConstantScoreQueryDescriptor<TDocument>>
 {
 	internal ConstantScoreQueryDescriptor(Action<ConstantScoreQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ConstantScoreQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query FilterValue { get; set; }
-
 	private QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
 	public ConstantScoreQueryDescriptor<TDocument> Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query filter)
@@ -130,18 +127,15 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ConstantScoreQueryDescriptor : SerializableDescriptor<ConstantScoreQueryDescriptor>
 {
 	internal ConstantScoreQueryDescriptor(Action<ConstantScoreQueryDescriptor> configure) => configure.Invoke(this);
+
 	public ConstantScoreQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query FilterValue { get; set; }
-
 	private QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
 	public ConstantScoreQueryDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query filter)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateRangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateRangeQuery.g.cs
index 127afa60504..640838ce7ce 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateRangeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DateRangeQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class DateRangeQueryConverter : JsonConverter<DateRangeQuery>
 {
 	public override DateRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -207,27 +209,16 @@ public DateRangeQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public string? Format { get; set; }
-
 	public Elastic.Clients.Elasticsearch.DateMath? From { get; set; }
-
 	public Elastic.Clients.Elasticsearch.DateMath? Gt { get; set; }
-
 	public Elastic.Clients.Elasticsearch.DateMath? Gte { get; set; }
-
 	public Elastic.Clients.Elasticsearch.DateMath? Lt { get; set; }
-
 	public Elastic.Clients.Elasticsearch.DateMath? Lte { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? Relation { get; set; }
-
 	public string? TimeZone { get; set; }
-
 	public Elastic.Clients.Elasticsearch.DateMath? To { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(DateRangeQuery dateRangeQuery) => QueryDsl.Query.Range(dateRangeQuery);
@@ -236,6 +227,7 @@ public DateRangeQuery(Field field)
 public sealed partial class DateRangeQueryDescriptor<TDocument> : SerializableDescriptor<DateRangeQueryDescriptor<TDocument>>
 {
 	internal DateRangeQueryDescriptor(Action<DateRangeQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal DateRangeQueryDescriptor() : base()
 	{
 	}
@@ -255,27 +247,16 @@ public DateRangeQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? FromValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? GtValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? GteValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? LtValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? LteValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? RelationValue { get; set; }
-
 	private string? TimeZoneValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? ToValue { get; set; }
 
 	public DateRangeQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -437,6 +418,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DateRangeQueryDescriptor : SerializableDescriptor<DateRangeQueryDescriptor>
 {
 	internal DateRangeQueryDescriptor(Action<DateRangeQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal DateRangeQueryDescriptor() : base()
 	{
 	}
@@ -449,27 +431,16 @@ public DateRangeQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? FromValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? GtValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? GteValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? LtValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? LteValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? RelationValue { get; set; }
-
 	private string? TimeZoneValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.DateMath? ToValue { get; set; }
 
 	public DateRangeQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DisMaxQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DisMaxQuery.g.cs
index 0f43cefce5b..80320adec1e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DisMaxQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/DisMaxQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class DisMaxQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("queries")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query> Queries { get; set; }
-
 	[JsonInclude, JsonPropertyName("tie_breaker")]
 	public double? TieBreaker { get; set; }
 
@@ -45,22 +44,17 @@ public sealed partial class DisMaxQuery : SearchQuery
 public sealed partial class DisMaxQueryDescriptor<TDocument> : SerializableDescriptor<DisMaxQueryDescriptor<TDocument>>
 {
 	internal DisMaxQueryDescriptor(Action<DisMaxQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public DisMaxQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query> QueriesValue { get; set; }
-
 	private QueryDescriptor<TDocument> QueriesDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> QueriesDescriptorAction { get; set; }
-
 	private Action<QueryDescriptor<TDocument>>[] QueriesDescriptorActions { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private double? TieBreakerValue { get; set; }
 
 	public DisMaxQueryDescriptor<TDocument> Queries(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query> queries)
@@ -176,22 +170,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class DisMaxQueryDescriptor : SerializableDescriptor<DisMaxQueryDescriptor>
 {
 	internal DisMaxQueryDescriptor(Action<DisMaxQueryDescriptor> configure) => configure.Invoke(this);
+
 	public DisMaxQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query> QueriesValue { get; set; }
-
 	private QueryDescriptor QueriesDescriptor { get; set; }
-
 	private Action<QueryDescriptor> QueriesDescriptorAction { get; set; }
-
 	private Action<QueryDescriptor>[] QueriesDescriptorActions { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private double? TieBreakerValue { get; set; }
 
 	public DisMaxQueryDescriptor Queries(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Query> queries)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ExistsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ExistsQuery.g.cs
index 62eeb12c18e..1ba3171d000 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ExistsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ExistsQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class ExistsQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
@@ -42,14 +42,13 @@ public sealed partial class ExistsQuery : SearchQuery
 public sealed partial class ExistsQueryDescriptor<TDocument> : SerializableDescriptor<ExistsQueryDescriptor<TDocument>>
 {
 	internal ExistsQueryDescriptor(Action<ExistsQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ExistsQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
 
 	public ExistsQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -100,14 +99,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ExistsQueryDescriptor : SerializableDescriptor<ExistsQueryDescriptor>
 {
 	internal ExistsQueryDescriptor(Action<ExistsQueryDescriptor> configure) => configure.Invoke(this);
+
 	public ExistsQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
 
 	public ExistsQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldAndFormat.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldAndFormat.g.cs
index 1acf01a3d6e..8dd7e953f9d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldAndFormat.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldAndFormat.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,45 +25,64 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
+/// <summary>
+/// <para>A reference to a field with formatting instructions on how to return the value</para>
+/// </summary>
 public sealed partial class FieldAndFormat
 {
+	/// <summary>
+	/// <para>Wildcard pattern. The request returns values for field names matching this pattern.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
+	/// <summary>
+	/// <para>Format in which the values are returned.</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("format")]
 	public string? Format { get; set; }
-
 	[JsonInclude, JsonPropertyName("include_unmapped")]
 	public bool? IncludeUnmapped { get; set; }
 }
 
+/// <summary>
+/// <para>A reference to a field with formatting instructions on how to return the value</para>
+/// </summary>
 public sealed partial class FieldAndFormatDescriptor<TDocument> : SerializableDescriptor<FieldAndFormatDescriptor<TDocument>>
 {
 	internal FieldAndFormatDescriptor(Action<FieldAndFormatDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FieldAndFormatDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private bool? IncludeUnmappedValue { get; set; }
 
+	/// <summary>
+	/// <para>Wildcard pattern. The request returns values for field names matching this pattern.</para>
+	/// </summary>
 	public FieldAndFormatDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Wildcard pattern. The request returns values for field names matching this pattern.</para>
+	/// </summary>
 	public FieldAndFormatDescriptor<TDocument> Field<TValue>(Expression<Func<TDocument, TValue>> field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Format in which the values are returned.</para>
+	/// </summary>
 	public FieldAndFormatDescriptor<TDocument> Format(string? format)
 	{
 		FormatValue = format;
@@ -95,37 +116,51 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 	}
 }
 
+/// <summary>
+/// <para>A reference to a field with formatting instructions on how to return the value</para>
+/// </summary>
 public sealed partial class FieldAndFormatDescriptor : SerializableDescriptor<FieldAndFormatDescriptor>
 {
 	internal FieldAndFormatDescriptor(Action<FieldAndFormatDescriptor> configure) => configure.Invoke(this);
+
 	public FieldAndFormatDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? FormatValue { get; set; }
-
 	private bool? IncludeUnmappedValue { get; set; }
 
+	/// <summary>
+	/// <para>Wildcard pattern. The request returns values for field names matching this pattern.</para>
+	/// </summary>
 	public FieldAndFormatDescriptor Field(Elastic.Clients.Elasticsearch.Field field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Wildcard pattern. The request returns values for field names matching this pattern.</para>
+	/// </summary>
 	public FieldAndFormatDescriptor Field<TDocument, TValue>(Expression<Func<TDocument, TValue>> field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Wildcard pattern. The request returns values for field names matching this pattern.</para>
+	/// </summary>
 	public FieldAndFormatDescriptor Field<TDocument>(Expression<Func<TDocument, object>> field)
 	{
 		FieldValue = field;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Format in which the values are returned.</para>
+	/// </summary>
 	public FieldAndFormatDescriptor Format(string? format)
 	{
 		FormatValue = format;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldValueFactorScoreFunction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldValueFactorScoreFunction.g.cs
index 01e142bb746..532d15f8928 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldValueFactorScoreFunction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FieldValueFactorScoreFunction.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class FieldValueFactorScoreFunction
 {
 	[JsonInclude, JsonPropertyName("factor")]
 	public double? Factor { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("missing")]
 	public double? Missing { get; set; }
-
 	[JsonInclude, JsonPropertyName("modifier")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorModifier? Modifier { get; set; }
 
@@ -45,16 +44,14 @@ public sealed partial class FieldValueFactorScoreFunction
 public sealed partial class FieldValueFactorScoreFunctionDescriptor<TDocument> : SerializableDescriptor<FieldValueFactorScoreFunctionDescriptor<TDocument>>
 {
 	internal FieldValueFactorScoreFunctionDescriptor(Action<FieldValueFactorScoreFunctionDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FieldValueFactorScoreFunctionDescriptor() : base()
 	{
 	}
 
 	private double? FactorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private double? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorModifier? ModifierValue { get; set; }
 
 	public FieldValueFactorScoreFunctionDescriptor<TDocument> Factor(double? factor)
@@ -117,16 +114,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FieldValueFactorScoreFunctionDescriptor : SerializableDescriptor<FieldValueFactorScoreFunctionDescriptor>
 {
 	internal FieldValueFactorScoreFunctionDescriptor(Action<FieldValueFactorScoreFunctionDescriptor> configure) => configure.Invoke(this);
+
 	public FieldValueFactorScoreFunctionDescriptor() : base()
 	{
 	}
 
 	private double? FactorValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private double? MissingValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorModifier? ModifierValue { get; set; }
 
 	public FieldValueFactorScoreFunctionDescriptor Factor(double? factor)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScore.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScore.g.cs
index c27d510c66f..4d10e4029c8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScore.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScore.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 [JsonConverter(typeof(FunctionScoreConverter))]
 public sealed partial class FunctionScore
 {
@@ -41,15 +43,14 @@ internal FunctionScore(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static FunctionScore FieldValueFactor(Elastic.Clients.Elasticsearch.QueryDsl.FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => new FunctionScore("field_value_factor", fieldValueFactorScoreFunction);
 	public static FunctionScore RandomScore(Elastic.Clients.Elasticsearch.QueryDsl.RandomScoreFunction randomScoreFunction) => new FunctionScore("random_score", randomScoreFunction);
 	public static FunctionScore ScriptScore(Elastic.Clients.Elasticsearch.QueryDsl.ScriptScoreFunction scriptScoreFunction) => new FunctionScore("script_score", scriptScoreFunction);
+
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("weight")]
 	public double? Weight { get; set; }
 }
@@ -160,20 +161,17 @@ public override void Write(Utf8JsonWriter writer, FunctionScore value, JsonSeria
 public sealed partial class FunctionScoreDescriptor<TDocument> : SerializableDescriptor<FunctionScoreDescriptor<TDocument>>
 {
 	internal FunctionScoreDescriptor(Action<FunctionScoreDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FunctionScoreDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private FunctionScoreDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private FunctionScoreDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -192,11 +190,8 @@ private FunctionScoreDescriptor<TDocument> Set(object variant, string variantNam
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDescriptor<TDocument> FilterDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> FilterDescriptorAction { get; set; }
-
 	private double? WeightValue { get; set; }
 
 	public FunctionScoreDescriptor<TDocument> Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
@@ -235,6 +230,7 @@ public FunctionScoreDescriptor<TDocument> Weight(double? weight)
 	public FunctionScoreDescriptor<TDocument> RandomScore(Action<RandomScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "random_score");
 	public FunctionScoreDescriptor<TDocument> ScriptScore(ScriptScoreFunction scriptScoreFunction) => Set(scriptScoreFunction, "script_score");
 	public FunctionScoreDescriptor<TDocument> ScriptScore(Action<ScriptScoreFunctionDescriptor> configure) => Set(configure, "script_score");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -282,20 +278,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FunctionScoreDescriptor : SerializableDescriptor<FunctionScoreDescriptor>
 {
 	internal FunctionScoreDescriptor(Action<FunctionScoreDescriptor> configure) => configure.Invoke(this);
+
 	public FunctionScoreDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private FunctionScoreDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private FunctionScoreDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -314,11 +307,8 @@ private FunctionScoreDescriptor Set(object variant, string variantName)
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? FilterValue { get; set; }
-
 	private QueryDescriptor FilterDescriptor { get; set; }
-
 	private Action<QueryDescriptor> FilterDescriptorAction { get; set; }
-
 	private double? WeightValue { get; set; }
 
 	public FunctionScoreDescriptor Filter(Elastic.Clients.Elasticsearch.QueryDsl.Query? filter)
@@ -359,6 +349,7 @@ public FunctionScoreDescriptor Weight(double? weight)
 	public FunctionScoreDescriptor RandomScore<TDocument>(Action<RandomScoreFunctionDescriptor<TDocument>> configure) => Set(configure, "random_score");
 	public FunctionScoreDescriptor ScriptScore(ScriptScoreFunction scriptScoreFunction) => Set(scriptScoreFunction, "script_score");
 	public FunctionScoreDescriptor ScriptScore(Action<ScriptScoreFunctionDescriptor> configure) => Set(configure, "script_score");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs
index 8a3b0b2d6e5..8ca090e4320 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class FunctionScoreQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost_mode")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.FunctionBoostMode? BoostMode { get; set; }
-
 	[JsonInclude, JsonPropertyName("functions")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScore>? Functions { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_boost")]
 	public double? MaxBoost { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_score")]
 	public double? MinScore { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query? Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("score_mode")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreMode? ScoreMode { get; set; }
 
@@ -57,34 +52,23 @@ public sealed partial class FunctionScoreQuery : SearchQuery
 public sealed partial class FunctionScoreQueryDescriptor<TDocument> : SerializableDescriptor<FunctionScoreQueryDescriptor<TDocument>>
 {
 	internal FunctionScoreQueryDescriptor(Action<FunctionScoreQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public FunctionScoreQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScore>? FunctionsValue { get; set; }
-
 	private FunctionScoreDescriptor<TDocument> FunctionsDescriptor { get; set; }
-
 	private Action<FunctionScoreDescriptor<TDocument>> FunctionsDescriptorAction { get; set; }
-
 	private Action<FunctionScoreDescriptor<TDocument>>[] FunctionsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.FunctionBoostMode? BoostModeValue { get; set; }
-
 	private double? MaxBoostValue { get; set; }
-
 	private double? MinScoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreMode? ScoreModeValue { get; set; }
 
 	public FunctionScoreQueryDescriptor<TDocument> Functions(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScore>? functions)
@@ -276,34 +260,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FunctionScoreQueryDescriptor : SerializableDescriptor<FunctionScoreQueryDescriptor>
 {
 	internal FunctionScoreQueryDescriptor(Action<FunctionScoreQueryDescriptor> configure) => configure.Invoke(this);
+
 	public FunctionScoreQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScore>? FunctionsValue { get; set; }
-
 	private FunctionScoreDescriptor FunctionsDescriptor { get; set; }
-
 	private Action<FunctionScoreDescriptor> FunctionsDescriptorAction { get; set; }
-
 	private Action<FunctionScoreDescriptor>[] FunctionsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query? QueryValue { get; set; }
-
 	private QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.FunctionBoostMode? BoostModeValue { get; set; }
-
 	private double? MaxBoostValue { get; set; }
-
 	private double? MinScoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.FunctionScoreMode? ScoreModeValue { get; set; }
 
 	public FunctionScoreQueryDescriptor Functions(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.FunctionScore>? functions)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FuzzyQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FuzzyQuery.g.cs
index beefd808e28..e23fe8a5a63 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FuzzyQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FuzzyQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class FuzzyQueryConverter : JsonConverter<FuzzyQuery>
 {
 	public override FuzzyQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -167,21 +169,13 @@ public FuzzyQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Fuzziness? Fuzziness { get; set; }
-
 	public int? MaxExpansions { get; set; }
-
 	public int? PrefixLength { get; set; }
-
 	public string? Rewrite { get; set; }
-
 	public bool? Transpositions { get; set; }
-
 	public object Value { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(FuzzyQuery fuzzyQuery) => QueryDsl.Query.Fuzzy(fuzzyQuery);
@@ -190,6 +184,7 @@ public FuzzyQuery(Field field)
 public sealed partial class FuzzyQueryDescriptor<TDocument> : SerializableDescriptor<FuzzyQueryDescriptor<TDocument>>
 {
 	internal FuzzyQueryDescriptor(Action<FuzzyQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal FuzzyQueryDescriptor() : base()
 	{
 	}
@@ -209,21 +204,13 @@ public FuzzyQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private int? MaxExpansionsValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private string? RewriteValue { get; set; }
-
 	private bool? TranspositionsValue { get; set; }
-
 	private object ValueValue { get; set; }
 
 	public FuzzyQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -345,6 +332,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class FuzzyQueryDescriptor : SerializableDescriptor<FuzzyQueryDescriptor>
 {
 	internal FuzzyQueryDescriptor(Action<FuzzyQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal FuzzyQueryDescriptor() : base()
 	{
 	}
@@ -357,21 +345,13 @@ public FuzzyQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private int? MaxExpansionsValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private string? RewriteValue { get; set; }
-
 	private bool? TranspositionsValue { get; set; }
-
 	private object ValueValue { get; set; }
 
 	public FuzzyQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoBoundingBoxQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoBoundingBoxQuery.g.cs
index c1c1726ea16..4bd839f5bde 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoBoundingBoxQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoBoundingBoxQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class GeoBoundingBoxQueryConverter : JsonConverter<GeoBoundingBoxQuery>
 {
 	public override GeoBoundingBoxQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -117,15 +119,10 @@ public override void Write(Utf8JsonWriter writer, GeoBoundingBoxQuery value, Jso
 public sealed partial class GeoBoundingBoxQuery : SearchQuery
 {
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public Elastic.Clients.Elasticsearch.GeoBounds BoundingBox { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	public bool? IgnoreUnmapped { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod? ValidationMethod { get; set; }
 
 	public static implicit operator Query(GeoBoundingBoxQuery geoBoundingBoxQuery) => QueryDsl.Query.GeoBoundingBox(geoBoundingBoxQuery);
@@ -134,20 +131,16 @@ public sealed partial class GeoBoundingBoxQuery : SearchQuery
 public sealed partial class GeoBoundingBoxQueryDescriptor<TDocument> : SerializableDescriptor<GeoBoundingBoxQueryDescriptor<TDocument>>
 {
 	internal GeoBoundingBoxQueryDescriptor(Action<GeoBoundingBoxQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GeoBoundingBoxQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod? ValidationMethodValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoBounds BoundingBoxValue { get; set; }
 
 	public GeoBoundingBoxQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -233,20 +226,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class GeoBoundingBoxQueryDescriptor : SerializableDescriptor<GeoBoundingBoxQueryDescriptor>
 {
 	internal GeoBoundingBoxQueryDescriptor(Action<GeoBoundingBoxQueryDescriptor> configure) => configure.Invoke(this);
+
 	public GeoBoundingBoxQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod? ValidationMethodValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoBounds BoundingBoxValue { get; set; }
 
 	public GeoBoundingBoxQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDistanceQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDistanceQuery.g.cs
index f64804a9a4e..684962732cb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDistanceQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoDistanceQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class GeoDistanceQueryConverter : JsonConverter<GeoDistanceQuery>
 {
 	public override GeoDistanceQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -129,17 +131,11 @@ public override void Write(Utf8JsonWriter writer, GeoDistanceQuery value, JsonSe
 public sealed partial class GeoDistanceQuery : SearchQuery
 {
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public string? Distance { get; set; }
-
 	public Elastic.Clients.Elasticsearch.GeoDistanceType? DistanceType { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	public Elastic.Clients.Elasticsearch.GeoLocation Location { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod? ValidationMethod { get; set; }
 
 	public static implicit operator Query(GeoDistanceQuery geoDistanceQuery) => QueryDsl.Query.GeoDistance(geoDistanceQuery);
@@ -148,22 +144,17 @@ public sealed partial class GeoDistanceQuery : SearchQuery
 public sealed partial class GeoDistanceQueryDescriptor<TDocument> : SerializableDescriptor<GeoDistanceQueryDescriptor<TDocument>>
 {
 	internal GeoDistanceQueryDescriptor(Action<GeoDistanceQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GeoDistanceQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private string? DistanceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoDistanceType? DistanceTypeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod? ValidationMethodValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoLocation LocationValue { get; set; }
 
 	public GeoDistanceQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -261,22 +252,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class GeoDistanceQueryDescriptor : SerializableDescriptor<GeoDistanceQueryDescriptor>
 {
 	internal GeoDistanceQueryDescriptor(Action<GeoDistanceQueryDescriptor> configure) => configure.Invoke(this);
+
 	public GeoDistanceQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private string? DistanceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoDistanceType? DistanceTypeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod? ValidationMethodValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoLocation LocationValue { get; set; }
 
 	public GeoDistanceQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoPolygonPoints.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoPolygonPoints.g.cs
index 8cab74340ea..a6b9d292fe5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoPolygonPoints.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoPolygonPoints.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class GeoPolygonPoints
 {
 	[JsonInclude, JsonPropertyName("points")]
@@ -34,6 +36,7 @@ public sealed partial class GeoPolygonPoints
 public sealed partial class GeoPolygonPointsDescriptor : SerializableDescriptor<GeoPolygonPointsDescriptor>
 {
 	internal GeoPolygonPointsDescriptor(Action<GeoPolygonPointsDescriptor> configure) => configure.Invoke(this);
+
 	public GeoPolygonPointsDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoPolygonQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoPolygonQuery.g.cs
index b73eba6d2d5..f73c52efb30 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoPolygonQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/GeoPolygonQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class GeoPolygonQueryConverter : JsonConverter<GeoPolygonQuery>
 {
 	public override GeoPolygonQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -117,15 +119,10 @@ public override void Write(Utf8JsonWriter writer, GeoPolygonQuery value, JsonSer
 public sealed partial class GeoPolygonQuery : SearchQuery
 {
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	public bool? IgnoreUnmapped { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.GeoPolygonPoints Polygon { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod? ValidationMethod { get; set; }
 
 	public static implicit operator Query(GeoPolygonQuery geoPolygonQuery) => QueryDsl.Query.GeoPolygon(geoPolygonQuery);
@@ -134,24 +131,18 @@ public sealed partial class GeoPolygonQuery : SearchQuery
 public sealed partial class GeoPolygonQueryDescriptor<TDocument> : SerializableDescriptor<GeoPolygonQueryDescriptor<TDocument>>
 {
 	internal GeoPolygonQueryDescriptor(Action<GeoPolygonQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public GeoPolygonQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod? ValidationMethodValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.GeoPolygonPoints PolygonValue { get; set; }
-
 	private GeoPolygonPointsDescriptor PolygonDescriptor { get; set; }
-
 	private Action<GeoPolygonPointsDescriptor> PolygonDescriptorAction { get; set; }
 
 	public GeoPolygonQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -265,24 +256,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class GeoPolygonQueryDescriptor : SerializableDescriptor<GeoPolygonQueryDescriptor>
 {
 	internal GeoPolygonQueryDescriptor(Action<GeoPolygonQueryDescriptor> configure) => configure.Invoke(this);
+
 	public GeoPolygonQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.GeoValidationMethod? ValidationMethodValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.GeoPolygonPoints PolygonValue { get; set; }
-
 	private GeoPolygonPointsDescriptor PolygonDescriptor { get; set; }
-
 	private Action<GeoPolygonPointsDescriptor> PolygonDescriptorAction { get; set; }
 
 	public GeoPolygonQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasChildQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasChildQuery.g.cs
index e552c647a36..68ebe40cb44 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasChildQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasChildQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,34 +25,26 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class HasChildQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_unmapped")]
 	public bool? IgnoreUnmapped { get; set; }
-
 	[JsonInclude, JsonPropertyName("inner_hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.InnerHits? InnerHits { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_children")]
 	public int? MaxChildren { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_children")]
 	public int? MinChildren { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("score_mode")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.ChildScoreMode? ScoreMode { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; set; }
 
@@ -60,34 +54,23 @@ public sealed partial class HasChildQuery : SearchQuery
 public sealed partial class HasChildQueryDescriptor<TDocument> : SerializableDescriptor<HasChildQueryDescriptor<TDocument>>
 {
 	internal HasChildQueryDescriptor(Action<HasChildQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public HasChildQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.InnerHits? InnerHitsValue { get; set; }
-
 	private Core.Search.InnerHitsDescriptor<TDocument> InnerHitsDescriptor { get; set; }
-
 	private Action<Core.Search.InnerHitsDescriptor<TDocument>> InnerHitsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private int? MaxChildrenValue { get; set; }
-
 	private int? MinChildrenValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ChildScoreMode? ScoreModeValue { get; set; }
-
 	private string TypeValue { get; set; }
 
 	public HasChildQueryDescriptor<TDocument> InnerHits(Elastic.Clients.Elasticsearch.Core.Search.InnerHits? innerHits)
@@ -260,34 +243,23 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class HasChildQueryDescriptor : SerializableDescriptor<HasChildQueryDescriptor>
 {
 	internal HasChildQueryDescriptor(Action<HasChildQueryDescriptor> configure) => configure.Invoke(this);
+
 	public HasChildQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.InnerHits? InnerHitsValue { get; set; }
-
 	private Core.Search.InnerHitsDescriptor InnerHitsDescriptor { get; set; }
-
 	private Action<Core.Search.InnerHitsDescriptor> InnerHitsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private int? MaxChildrenValue { get; set; }
-
 	private int? MinChildrenValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ChildScoreMode? ScoreModeValue { get; set; }
-
 	private string TypeValue { get; set; }
 
 	public HasChildQueryDescriptor InnerHits(Elastic.Clients.Elasticsearch.Core.Search.InnerHits? innerHits)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasParentQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasParentQuery.g.cs
index a95c7a68dcd..5c2e5492e4e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasParentQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/HasParentQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class HasParentQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_unmapped")]
 	public bool? IgnoreUnmapped { get; set; }
-
 	[JsonInclude, JsonPropertyName("inner_hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.InnerHits? InnerHits { get; set; }
-
 	[JsonInclude, JsonPropertyName("parent_type")]
 	public string ParentType { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("score")]
 	public bool? Score { get; set; }
 
@@ -54,30 +50,21 @@ public sealed partial class HasParentQuery : SearchQuery
 public sealed partial class HasParentQueryDescriptor<TDocument> : SerializableDescriptor<HasParentQueryDescriptor<TDocument>>
 {
 	internal HasParentQueryDescriptor(Action<HasParentQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public HasParentQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.InnerHits? InnerHitsValue { get; set; }
-
 	private Core.Search.InnerHitsDescriptor<TDocument> InnerHitsDescriptor { get; set; }
-
 	private Action<Core.Search.InnerHitsDescriptor<TDocument>> InnerHitsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private string ParentTypeValue { get; set; }
-
 	private bool? ScoreValue { get; set; }
 
 	public HasParentQueryDescriptor<TDocument> InnerHits(Elastic.Clients.Elasticsearch.Core.Search.InnerHits? innerHits)
@@ -226,30 +213,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class HasParentQueryDescriptor : SerializableDescriptor<HasParentQueryDescriptor>
 {
 	internal HasParentQueryDescriptor(Action<HasParentQueryDescriptor> configure) => configure.Invoke(this);
+
 	public HasParentQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.InnerHits? InnerHitsValue { get; set; }
-
 	private Core.Search.InnerHitsDescriptor InnerHitsDescriptor { get; set; }
-
 	private Action<Core.Search.InnerHitsDescriptor> InnerHitsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private string ParentTypeValue { get; set; }
-
 	private bool? ScoreValue { get; set; }
 
 	public HasParentQueryDescriptor InnerHits(Elastic.Clients.Elasticsearch.Core.Search.InnerHits? innerHits)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IdsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IdsQuery.g.cs
index 53cecd21ab0..f5c656ee2c4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IdsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IdsQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class IdsQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("values")]
 	public Elastic.Clients.Elasticsearch.Ids? Values { get; set; }
 
@@ -42,14 +42,13 @@ public sealed partial class IdsQuery : SearchQuery
 public sealed partial class IdsQueryDescriptor : SerializableDescriptor<IdsQueryDescriptor>
 {
 	internal IdsQueryDescriptor(Action<IdsQueryDescriptor> configure) => configure.Invoke(this);
+
 	public IdsQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Ids? ValuesValue { get; set; }
 
 	public IdsQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Intervals.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Intervals.g.cs
index 4d7aee5a8e7..59fa5ca7afd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Intervals.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Intervals.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 [JsonConverter(typeof(IntervalsConverter))]
 public sealed partial class Intervals
 {
@@ -41,7 +43,6 @@ internal Intervals(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static Intervals AllOf(Elastic.Clients.Elasticsearch.QueryDsl.IntervalsAllOf intervalsAllOf) => new Intervals("all_of", intervalsAllOf);
@@ -147,20 +148,17 @@ public override void Write(Utf8JsonWriter writer, Intervals value, JsonSerialize
 public sealed partial class IntervalsDescriptor<TDocument> : SerializableDescriptor<IntervalsDescriptor<TDocument>>
 {
 	internal IntervalsDescriptor(Action<IntervalsDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IntervalsDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private IntervalsDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private IntervalsDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -190,6 +188,7 @@ private IntervalsDescriptor<TDocument> Set(object variant, string variantName)
 	public IntervalsDescriptor<TDocument> Prefix(Action<IntervalsPrefixDescriptor<TDocument>> configure) => Set(configure, "prefix");
 	public IntervalsDescriptor<TDocument> Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard");
 	public IntervalsDescriptor<TDocument> Wildcard(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -215,20 +214,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IntervalsDescriptor : SerializableDescriptor<IntervalsDescriptor>
 {
 	internal IntervalsDescriptor(Action<IntervalsDescriptor> configure) => configure.Invoke(this);
+
 	public IntervalsDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private IntervalsDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private IntervalsDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -264,6 +260,7 @@ private IntervalsDescriptor Set(object variant, string variantName)
 	public IntervalsDescriptor Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard");
 	public IntervalsDescriptor Wildcard(Action<IntervalsWildcardDescriptor> configure) => Set(configure, "wildcard");
 	public IntervalsDescriptor Wildcard<TDocument>(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAllOf.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAllOf.g.cs
index 7fdd77fc915..6da4dde6ffb 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAllOf.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAllOf.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class IntervalsAllOf
 {
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("intervals")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Intervals> Intervals { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_gaps")]
 	public int? MaxGaps { get; set; }
-
 	[JsonInclude, JsonPropertyName("ordered")]
 	public bool? Ordered { get; set; }
 }
@@ -43,26 +42,19 @@ public sealed partial class IntervalsAllOf
 public sealed partial class IntervalsAllOfDescriptor<TDocument> : SerializableDescriptor<IntervalsAllOfDescriptor<TDocument>>
 {
 	internal IntervalsAllOfDescriptor(Action<IntervalsAllOfDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IntervalsAllOfDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Intervals> IntervalsValue { get; set; }
-
 	private IntervalsDescriptor<TDocument> IntervalsDescriptor { get; set; }
-
 	private Action<IntervalsDescriptor<TDocument>> IntervalsDescriptorAction { get; set; }
-
 	private Action<IntervalsDescriptor<TDocument>>[] IntervalsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? FilterValue { get; set; }
-
 	private IntervalsFilterDescriptor FilterDescriptor { get; set; }
-
 	private Action<IntervalsFilterDescriptor> FilterDescriptorAction { get; set; }
-
 	private int? MaxGapsValue { get; set; }
-
 	private bool? OrderedValue { get; set; }
 
 	public IntervalsAllOfDescriptor<TDocument> Intervals(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Intervals> intervals)
@@ -206,26 +198,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IntervalsAllOfDescriptor : SerializableDescriptor<IntervalsAllOfDescriptor>
 {
 	internal IntervalsAllOfDescriptor(Action<IntervalsAllOfDescriptor> configure) => configure.Invoke(this);
+
 	public IntervalsAllOfDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Intervals> IntervalsValue { get; set; }
-
 	private IntervalsDescriptor IntervalsDescriptor { get; set; }
-
 	private Action<IntervalsDescriptor> IntervalsDescriptorAction { get; set; }
-
 	private Action<IntervalsDescriptor>[] IntervalsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? FilterValue { get; set; }
-
 	private IntervalsFilterDescriptor FilterDescriptor { get; set; }
-
 	private Action<IntervalsFilterDescriptor> FilterDescriptorAction { get; set; }
-
 	private int? MaxGapsValue { get; set; }
-
 	private bool? OrderedValue { get; set; }
 
 	public IntervalsAllOfDescriptor Intervals(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Intervals> intervals)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAnyOf.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAnyOf.g.cs
index 4cbc2bdce29..c6adb242d46 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAnyOf.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsAnyOf.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class IntervalsAnyOf
 {
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("intervals")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Intervals> Intervals { get; set; }
 }
@@ -37,22 +38,17 @@ public sealed partial class IntervalsAnyOf
 public sealed partial class IntervalsAnyOfDescriptor<TDocument> : SerializableDescriptor<IntervalsAnyOfDescriptor<TDocument>>
 {
 	internal IntervalsAnyOfDescriptor(Action<IntervalsAnyOfDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IntervalsAnyOfDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Intervals> IntervalsValue { get; set; }
-
 	private IntervalsDescriptor<TDocument> IntervalsDescriptor { get; set; }
-
 	private Action<IntervalsDescriptor<TDocument>> IntervalsDescriptorAction { get; set; }
-
 	private Action<IntervalsDescriptor<TDocument>>[] IntervalsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? FilterValue { get; set; }
-
 	private IntervalsFilterDescriptor FilterDescriptor { get; set; }
-
 	private Action<IntervalsFilterDescriptor> FilterDescriptorAction { get; set; }
 
 	public IntervalsAnyOfDescriptor<TDocument> Intervals(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Intervals> intervals)
@@ -172,22 +168,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IntervalsAnyOfDescriptor : SerializableDescriptor<IntervalsAnyOfDescriptor>
 {
 	internal IntervalsAnyOfDescriptor(Action<IntervalsAnyOfDescriptor> configure) => configure.Invoke(this);
+
 	public IntervalsAnyOfDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Intervals> IntervalsValue { get; set; }
-
 	private IntervalsDescriptor IntervalsDescriptor { get; set; }
-
 	private Action<IntervalsDescriptor> IntervalsDescriptorAction { get; set; }
-
 	private Action<IntervalsDescriptor>[] IntervalsDescriptorActions { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? FilterValue { get; set; }
-
 	private IntervalsFilterDescriptor FilterDescriptor { get; set; }
-
 	private Action<IntervalsFilterDescriptor> FilterDescriptorAction { get; set; }
 
 	public IntervalsAnyOfDescriptor Intervals(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Intervals> intervals)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs
index 23b0f297d38..8b15729563d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 [JsonConverter(typeof(IntervalsFilterConverter))]
 public sealed partial class IntervalsFilter
 {
@@ -41,7 +43,6 @@ internal IntervalsFilter(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 }
 
@@ -76,20 +77,17 @@ public override void Write(Utf8JsonWriter writer, IntervalsFilter value, JsonSer
 public sealed partial class IntervalsFilterDescriptor<TDocument> : SerializableDescriptor<IntervalsFilterDescriptor<TDocument>>
 {
 	internal IntervalsFilterDescriptor(Action<IntervalsFilterDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IntervalsFilterDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private IntervalsFilterDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private IntervalsFilterDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -132,20 +130,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IntervalsFilterDescriptor : SerializableDescriptor<IntervalsFilterDescriptor>
 {
 	internal IntervalsFilterDescriptor(Action<IntervalsFilterDescriptor> configure) => configure.Invoke(this);
+
 	public IntervalsFilterDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private IntervalsFilterDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private IntervalsFilterDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFuzzy.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFuzzy.g.cs
index c22621263d1..74a648754a2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFuzzy.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFuzzy.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class IntervalsFuzzy
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzziness")]
 	public Elastic.Clients.Elasticsearch.Fuzziness? Fuzziness { get; set; }
-
 	[JsonInclude, JsonPropertyName("prefix_length")]
 	public int? PrefixLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("term")]
 	public string Term { get; set; }
-
 	[JsonInclude, JsonPropertyName("transpositions")]
 	public bool? Transpositions { get; set; }
-
 	[JsonInclude, JsonPropertyName("use_field")]
 	public Elastic.Clients.Elasticsearch.Field? UseField { get; set; }
 }
@@ -49,20 +46,16 @@ public sealed partial class IntervalsFuzzy
 public sealed partial class IntervalsFuzzyDescriptor<TDocument> : SerializableDescriptor<IntervalsFuzzyDescriptor<TDocument>>
 {
 	internal IntervalsFuzzyDescriptor(Action<IntervalsFuzzyDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IntervalsFuzzyDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private string TermValue { get; set; }
-
 	private bool? TranspositionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? UseFieldValue { get; set; }
 
 	public IntervalsFuzzyDescriptor<TDocument> Analyzer(string? analyzer)
@@ -149,20 +142,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IntervalsFuzzyDescriptor : SerializableDescriptor<IntervalsFuzzyDescriptor>
 {
 	internal IntervalsFuzzyDescriptor(Action<IntervalsFuzzyDescriptor> configure) => configure.Invoke(this);
+
 	public IntervalsFuzzyDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private string TermValue { get; set; }
-
 	private bool? TranspositionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? UseFieldValue { get; set; }
 
 	public IntervalsFuzzyDescriptor Analyzer(string? analyzer)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsMatch.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsMatch.g.cs
index 7ee6d477129..c62870e220b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsMatch.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsMatch.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class IntervalsMatch
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("filter")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? Filter { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_gaps")]
 	public int? MaxGaps { get; set; }
-
 	[JsonInclude, JsonPropertyName("ordered")]
 	public bool? Ordered { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("use_field")]
 	public Elastic.Clients.Elasticsearch.Field? UseField { get; set; }
 }
@@ -49,24 +46,18 @@ public sealed partial class IntervalsMatch
 public sealed partial class IntervalsMatchDescriptor<TDocument> : SerializableDescriptor<IntervalsMatchDescriptor<TDocument>>
 {
 	internal IntervalsMatchDescriptor(Action<IntervalsMatchDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IntervalsMatchDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? FilterValue { get; set; }
-
 	private IntervalsFilterDescriptor FilterDescriptor { get; set; }
-
 	private Action<IntervalsFilterDescriptor> FilterDescriptorAction { get; set; }
-
 	private int? MaxGapsValue { get; set; }
-
 	private bool? OrderedValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? UseFieldValue { get; set; }
 
 	public IntervalsMatchDescriptor<TDocument> Analyzer(string? analyzer)
@@ -181,24 +172,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IntervalsMatchDescriptor : SerializableDescriptor<IntervalsMatchDescriptor>
 {
 	internal IntervalsMatchDescriptor(Action<IntervalsMatchDescriptor> configure) => configure.Invoke(this);
+
 	public IntervalsMatchDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.IntervalsFilter? FilterValue { get; set; }
-
 	private IntervalsFilterDescriptor FilterDescriptor { get; set; }
-
 	private Action<IntervalsFilterDescriptor> FilterDescriptorAction { get; set; }
-
 	private int? MaxGapsValue { get; set; }
-
 	private bool? OrderedValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? UseFieldValue { get; set; }
 
 	public IntervalsMatchDescriptor Analyzer(string? analyzer)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsPrefix.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsPrefix.g.cs
index e9a0968bcec..686802fe4aa 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsPrefix.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsPrefix.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class IntervalsPrefix
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("prefix")]
 	public string Prefix { get; set; }
-
 	[JsonInclude, JsonPropertyName("use_field")]
 	public Elastic.Clients.Elasticsearch.Field? UseField { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class IntervalsPrefix
 public sealed partial class IntervalsPrefixDescriptor<TDocument> : SerializableDescriptor<IntervalsPrefixDescriptor<TDocument>>
 {
 	internal IntervalsPrefixDescriptor(Action<IntervalsPrefixDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IntervalsPrefixDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private string PrefixValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? UseFieldValue { get; set; }
 
 	public IntervalsPrefixDescriptor<TDocument> Analyzer(string? analyzer)
@@ -98,14 +97,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IntervalsPrefixDescriptor : SerializableDescriptor<IntervalsPrefixDescriptor>
 {
 	internal IntervalsPrefixDescriptor(Action<IntervalsPrefixDescriptor> configure) => configure.Invoke(this);
+
 	public IntervalsPrefixDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private string PrefixValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? UseFieldValue { get; set; }
 
 	public IntervalsPrefixDescriptor Analyzer(string? analyzer)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs
index 2509cd8bd55..38660c5d61e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 [JsonConverter(typeof(IntervalsQueryConverter))]
 public sealed partial class IntervalsQuery : SearchQuery
 {
@@ -53,12 +55,11 @@ internal IntervalsQuery(Field field, string variantName, object variant)
 	public static IntervalsQuery Match(Field field, Elastic.Clients.Elasticsearch.QueryDsl.IntervalsMatch intervalsMatch) => new IntervalsQuery(field, "match", intervalsMatch);
 	public static IntervalsQuery Prefix(Field field, Elastic.Clients.Elasticsearch.QueryDsl.IntervalsPrefix intervalsPrefix) => new IntervalsQuery(field, "prefix", intervalsPrefix);
 	public static IntervalsQuery Wildcard(Field field, Elastic.Clients.Elasticsearch.QueryDsl.IntervalsWildcard intervalsWildcard) => new IntervalsQuery(field, "wildcard", intervalsWildcard);
+
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
@@ -220,6 +221,7 @@ public override void Write(Utf8JsonWriter writer, IntervalsQuery value, JsonSeri
 public sealed partial class IntervalsQueryDescriptor<TDocument> : SerializableDescriptor<IntervalsQueryDescriptor<TDocument>>
 {
 	internal IntervalsQueryDescriptor(Action<IntervalsQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal IntervalsQueryDescriptor() : base()
 	{
 	}
@@ -232,15 +234,11 @@ public IntervalsQueryDescriptor(Field field)
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private IntervalsQueryDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private IntervalsQueryDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -259,9 +257,7 @@ private IntervalsQueryDescriptor<TDocument> Set(object variant, string variantNa
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
 
 	public IntervalsQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -300,6 +296,7 @@ public IntervalsQueryDescriptor<TDocument> Field<TValue>(Expression<Func<TDocume
 	public IntervalsQueryDescriptor<TDocument> Prefix(Action<IntervalsPrefixDescriptor<TDocument>> configure) => Set(configure, "prefix");
 	public IntervalsQueryDescriptor<TDocument> Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard");
 	public IntervalsQueryDescriptor<TDocument> Wildcard(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -341,6 +338,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IntervalsQueryDescriptor : SerializableDescriptor<IntervalsQueryDescriptor>
 {
 	internal IntervalsQueryDescriptor(Action<IntervalsQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal IntervalsQueryDescriptor() : base()
 	{
 	}
@@ -353,15 +351,11 @@ public IntervalsQueryDescriptor(Field field)
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private IntervalsQueryDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private IntervalsQueryDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -380,9 +374,7 @@ private IntervalsQueryDescriptor Set(object variant, string variantName)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
 
 	public IntervalsQueryDescriptor QueryName(string? queryName)
@@ -433,6 +425,7 @@ public IntervalsQueryDescriptor Field<TDocument>(Expression<Func<TDocument, obje
 	public IntervalsQueryDescriptor Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard");
 	public IntervalsQueryDescriptor Wildcard(Action<IntervalsWildcardDescriptor> configure) => Set(configure, "wildcard");
 	public IntervalsQueryDescriptor Wildcard<TDocument>(Action<IntervalsWildcardDescriptor<TDocument>> configure) => Set(configure, "wildcard");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsWildcard.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsWildcard.g.cs
index fc64240786f..1006dcf371e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsWildcard.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsWildcard.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class IntervalsWildcard
 {
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("pattern")]
 	public string Pattern { get; set; }
-
 	[JsonInclude, JsonPropertyName("use_field")]
 	public Elastic.Clients.Elasticsearch.Field? UseField { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class IntervalsWildcard
 public sealed partial class IntervalsWildcardDescriptor<TDocument> : SerializableDescriptor<IntervalsWildcardDescriptor<TDocument>>
 {
 	internal IntervalsWildcardDescriptor(Action<IntervalsWildcardDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public IntervalsWildcardDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private string PatternValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? UseFieldValue { get; set; }
 
 	public IntervalsWildcardDescriptor<TDocument> Analyzer(string? analyzer)
@@ -98,14 +97,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class IntervalsWildcardDescriptor : SerializableDescriptor<IntervalsWildcardDescriptor>
 {
 	internal IntervalsWildcardDescriptor(Action<IntervalsWildcardDescriptor> configure) => configure.Invoke(this);
+
 	public IntervalsWildcardDescriptor() : base()
 	{
 	}
 
 	private string? AnalyzerValue { get; set; }
-
 	private string PatternValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? UseFieldValue { get; set; }
 
 	public IntervalsWildcardDescriptor Analyzer(string? analyzer)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Like.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Like.g.cs
index df1969416cd..b08214e3932 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Like.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Like.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class Like : Union<string, Elastic.Clients.Elasticsearch.QueryDsl.LikeDocument>
 {
 	public Like(string text) : base(text)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/LikeDocument.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/LikeDocument.g.cs
index b70a3c2b66f..050447bf682 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/LikeDocument.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/LikeDocument.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,31 +25,24 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class LikeDocument
 {
 	[JsonInclude, JsonPropertyName("_id")]
 	public Elastic.Clients.Elasticsearch.Id? Id { get; set; }
-
 	[JsonInclude, JsonPropertyName("_index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("doc")]
 	public object? Doc { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Fields? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("per_field_analyzer")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, string>? PerFieldAnalyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
-
 	[JsonInclude, JsonPropertyName("version_type")]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get; set; }
 }
@@ -55,24 +50,18 @@ public sealed partial class LikeDocument
 public sealed partial class LikeDocumentDescriptor<TDocument> : SerializableDescriptor<LikeDocumentDescriptor<TDocument>>
 {
 	internal LikeDocumentDescriptor(Action<LikeDocumentDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public LikeDocumentDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Id? IdValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName? IndexValue { get; set; }
-
 	private object? DocValue { get; set; }
-
 	private Fields? FieldsValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, string>? PerFieldAnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private long? VersionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.VersionType? VersionTypeValue { get; set; }
 
 	public LikeDocumentDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id? id)
@@ -181,24 +170,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class LikeDocumentDescriptor : SerializableDescriptor<LikeDocumentDescriptor>
 {
 	internal LikeDocumentDescriptor(Action<LikeDocumentDescriptor> configure) => configure.Invoke(this);
+
 	public LikeDocumentDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Id? IdValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName? IndexValue { get; set; }
-
 	private object? DocValue { get; set; }
-
 	private Fields? FieldsValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, string>? PerFieldAnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private long? VersionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.VersionType? VersionTypeValue { get; set; }
 
 	public LikeDocumentDescriptor Id(Elastic.Clients.Elasticsearch.Id? id)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchAllQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchAllQuery.g.cs
index 7befc928c01..4126a014f00 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchAllQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchAllQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class MatchAllQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
@@ -39,12 +40,12 @@ public sealed partial class MatchAllQuery : SearchQuery
 public sealed partial class MatchAllQueryDescriptor : SerializableDescriptor<MatchAllQueryDescriptor>
 {
 	internal MatchAllQueryDescriptor(Action<MatchAllQueryDescriptor> configure) => configure.Invoke(this);
+
 	public MatchAllQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
 	public MatchAllQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs
index 56e3cdd8403..653a88a20dd 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchBoolPrefixQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class MatchBoolPrefixQueryConverter : JsonConverter<MatchBoolPrefixQuery>
 {
 	public override MatchBoolPrefixQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -203,27 +205,16 @@ public MatchBoolPrefixQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public string? Analyzer { get; set; }
-
 	public float? Boost { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Fuzziness? Fuzziness { get; set; }
-
 	public string? FuzzyRewrite { get; set; }
-
 	public bool? FuzzyTranspositions { get; set; }
-
 	public int? MaxExpansions { get; set; }
-
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? Operator { get; set; }
-
 	public int? PrefixLength { get; set; }
-
 	public string Query { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(MatchBoolPrefixQuery matchBoolPrefixQuery) => QueryDsl.Query.MatchBoolPrefix(matchBoolPrefixQuery);
@@ -232,6 +223,7 @@ public MatchBoolPrefixQuery(Field field)
 public sealed partial class MatchBoolPrefixQueryDescriptor<TDocument> : SerializableDescriptor<MatchBoolPrefixQueryDescriptor<TDocument>>
 {
 	internal MatchBoolPrefixQueryDescriptor(Action<MatchBoolPrefixQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal MatchBoolPrefixQueryDescriptor() : base()
 	{
 	}
@@ -251,27 +243,16 @@ public MatchBoolPrefixQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private string? FuzzyRewriteValue { get; set; }
-
 	private bool? FuzzyTranspositionsValue { get; set; }
-
 	private int? MaxExpansionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Operator? OperatorValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private string QueryValue { get; set; }
 
 	public MatchBoolPrefixQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -429,6 +410,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MatchBoolPrefixQueryDescriptor : SerializableDescriptor<MatchBoolPrefixQueryDescriptor>
 {
 	internal MatchBoolPrefixQueryDescriptor(Action<MatchBoolPrefixQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal MatchBoolPrefixQueryDescriptor() : base()
 	{
 	}
@@ -441,27 +423,16 @@ public MatchBoolPrefixQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private string? FuzzyRewriteValue { get; set; }
-
 	private bool? FuzzyTranspositionsValue { get; set; }
-
 	private int? MaxExpansionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Operator? OperatorValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private string QueryValue { get; set; }
 
 	public MatchBoolPrefixQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchNoneQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchNoneQuery.g.cs
index ea98b5e8893..a8c0fc38a8c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchNoneQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchNoneQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class MatchNoneQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
@@ -39,12 +40,12 @@ public sealed partial class MatchNoneQuery : SearchQuery
 public sealed partial class MatchNoneQueryDescriptor : SerializableDescriptor<MatchNoneQueryDescriptor>
 {
 	internal MatchNoneQueryDescriptor(Action<MatchNoneQueryDescriptor> configure) => configure.Invoke(this);
+
 	public MatchNoneQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
 	public MatchNoneQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs
index f317da081cb..0c74258d258 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhrasePrefixQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class MatchPhrasePrefixQueryConverter : JsonConverter<MatchPhrasePrefixQuery>
 {
 	public override MatchPhrasePrefixQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -155,19 +157,12 @@ public MatchPhrasePrefixQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public string? Analyzer { get; set; }
-
 	public float? Boost { get; set; }
-
 	public int? MaxExpansions { get; set; }
-
 	public string Query { get; set; }
-
 	public int? Slop { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQuery { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(MatchPhrasePrefixQuery matchPhrasePrefixQuery) => QueryDsl.Query.MatchPhrasePrefix(matchPhrasePrefixQuery);
@@ -176,6 +171,7 @@ public MatchPhrasePrefixQuery(Field field)
 public sealed partial class MatchPhrasePrefixQueryDescriptor<TDocument> : SerializableDescriptor<MatchPhrasePrefixQueryDescriptor<TDocument>>
 {
 	internal MatchPhrasePrefixQueryDescriptor(Action<MatchPhrasePrefixQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal MatchPhrasePrefixQueryDescriptor() : base()
 	{
 	}
@@ -195,19 +191,12 @@ public MatchPhrasePrefixQueryDescriptor(Expression<Func<TDocument, object>> fiel
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private int? MaxExpansionsValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private int? SlopValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQueryValue { get; set; }
 
 	public MatchPhrasePrefixQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -317,6 +306,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MatchPhrasePrefixQueryDescriptor : SerializableDescriptor<MatchPhrasePrefixQueryDescriptor>
 {
 	internal MatchPhrasePrefixQueryDescriptor(Action<MatchPhrasePrefixQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal MatchPhrasePrefixQueryDescriptor() : base()
 	{
 	}
@@ -329,19 +319,12 @@ public MatchPhrasePrefixQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private int? MaxExpansionsValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private int? SlopValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQueryValue { get; set; }
 
 	public MatchPhrasePrefixQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs
index 70a7ad833f6..9630b972ce8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchPhraseQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class MatchPhraseQueryConverter : JsonConverter<MatchPhraseQuery>
 {
 	public override MatchPhraseQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -143,17 +145,11 @@ public MatchPhraseQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public string? Analyzer { get; set; }
-
 	public float? Boost { get; set; }
-
 	public string Query { get; set; }
-
 	public int? Slop { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQuery { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(MatchPhraseQuery matchPhraseQuery) => QueryDsl.Query.MatchPhrase(matchPhraseQuery);
@@ -162,6 +158,7 @@ public MatchPhraseQuery(Field field)
 public sealed partial class MatchPhraseQueryDescriptor<TDocument> : SerializableDescriptor<MatchPhraseQueryDescriptor<TDocument>>
 {
 	internal MatchPhraseQueryDescriptor(Action<MatchPhraseQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal MatchPhraseQueryDescriptor() : base()
 	{
 	}
@@ -181,17 +178,11 @@ public MatchPhraseQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private int? SlopValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQueryValue { get; set; }
 
 	public MatchPhraseQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -289,6 +280,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MatchPhraseQueryDescriptor : SerializableDescriptor<MatchPhraseQueryDescriptor>
 {
 	internal MatchPhraseQueryDescriptor(Action<MatchPhraseQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal MatchPhraseQueryDescriptor() : base()
 	{
 	}
@@ -301,17 +293,11 @@ public MatchPhraseQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private int? SlopValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQueryValue { get; set; }
 
 	public MatchPhraseQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchQuery.g.cs
index eafaa5242a1..1bf4b85c287 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MatchQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class MatchQueryConverter : JsonConverter<MatchQuery>
 {
 	public override MatchQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -239,33 +241,19 @@ public MatchQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public string? Analyzer { get; set; }
-
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
-
 	public float? Boost { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Fuzziness? Fuzziness { get; set; }
-
 	public string? FuzzyRewrite { get; set; }
-
 	public bool? FuzzyTranspositions { get; set; }
-
 	public bool? Lenient { get; set; }
-
 	public int? MaxExpansions { get; set; }
-
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? Operator { get; set; }
-
 	public int? PrefixLength { get; set; }
-
 	public string Query { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQuery { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(MatchQuery matchQuery) => QueryDsl.Query.Match(matchQuery);
@@ -274,6 +262,7 @@ public MatchQuery(Field field)
 public sealed partial class MatchQueryDescriptor<TDocument> : SerializableDescriptor<MatchQueryDescriptor<TDocument>>
 {
 	internal MatchQueryDescriptor(Action<MatchQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal MatchQueryDescriptor() : base()
 	{
 	}
@@ -293,33 +282,19 @@ public MatchQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private bool? AutoGenerateSynonymsPhraseQueryValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private string? FuzzyRewriteValue { get; set; }
-
 	private bool? FuzzyTranspositionsValue { get; set; }
-
 	private bool? LenientValue { get; set; }
-
 	private int? MaxExpansionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Operator? OperatorValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQueryValue { get; set; }
 
 	public MatchQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -513,6 +488,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MatchQueryDescriptor : SerializableDescriptor<MatchQueryDescriptor>
 {
 	internal MatchQueryDescriptor(Action<MatchQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal MatchQueryDescriptor() : base()
 	{
 	}
@@ -525,33 +501,19 @@ public MatchQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private bool? AutoGenerateSynonymsPhraseQueryValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private string? FuzzyRewriteValue { get; set; }
-
 	private bool? FuzzyTranspositionsValue { get; set; }
-
 	private bool? LenientValue { get; set; }
-
 	private int? MaxExpansionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Operator? OperatorValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQueryValue { get; set; }
 
 	public MatchQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs
index 38976a3c6af..75b684bbf14 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MoreLikeThisQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,71 +25,51 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class MoreLikeThisQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost_terms")]
 	public double? BoostTerms { get; set; }
-
 	[JsonInclude, JsonPropertyName("fail_on_unsupported_field")]
 	public bool? FailOnUnsupportedField { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Fields? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("include")]
 	public bool? Include { get; set; }
-
 	[JsonInclude, JsonPropertyName("like"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Like))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Like> Like { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_doc_freq")]
 	public int? MaxDocFreq { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_query_terms")]
 	public int? MaxQueryTerms { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_word_length")]
 	public int? MaxWordLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_doc_freq")]
 	public int? MinDocFreq { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_term_freq")]
 	public int? MinTermFreq { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_word_length")]
 	public int? MinWordLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
-
 	[JsonInclude, JsonPropertyName("per_field_analyzer")]
 	public IDictionary<Elastic.Clients.Elasticsearch.Field, string>? PerFieldAnalyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
-
 	[JsonInclude, JsonPropertyName("stop_words")]
 	[JsonConverter(typeof(StopWordsConverter))]
 	public ICollection<string>? StopWords { get; set; }
-
 	[JsonInclude, JsonPropertyName("unlike"), SingleOrManyCollectionConverter(typeof(Elastic.Clients.Elasticsearch.QueryDsl.Like))]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Like>? Unlike { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
-
 	[JsonInclude, JsonPropertyName("version_type")]
 	public Elastic.Clients.Elasticsearch.VersionType? VersionType { get; set; }
 
@@ -97,50 +79,31 @@ public sealed partial class MoreLikeThisQuery : SearchQuery
 public sealed partial class MoreLikeThisQueryDescriptor<TDocument> : SerializableDescriptor<MoreLikeThisQueryDescriptor<TDocument>>
 {
 	internal MoreLikeThisQueryDescriptor(Action<MoreLikeThisQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MoreLikeThisQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private double? BoostTermsValue { get; set; }
-
 	private bool? FailOnUnsupportedFieldValue { get; set; }
-
 	private Fields? FieldsValue { get; set; }
-
 	private bool? IncludeValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Like> LikeValue { get; set; }
-
 	private int? MaxDocFreqValue { get; set; }
-
 	private int? MaxQueryTermsValue { get; set; }
-
 	private int? MaxWordLengthValue { get; set; }
-
 	private int? MinDocFreqValue { get; set; }
-
 	private int? MinTermFreqValue { get; set; }
-
 	private int? MinWordLengthValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, string>? PerFieldAnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private ICollection<string>? StopWordsValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Like>? UnlikeValue { get; set; }
-
 	private long? VersionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.VersionType? VersionTypeValue { get; set; }
 
 	public MoreLikeThisQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -401,50 +364,31 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MoreLikeThisQueryDescriptor : SerializableDescriptor<MoreLikeThisQueryDescriptor>
 {
 	internal MoreLikeThisQueryDescriptor(Action<MoreLikeThisQueryDescriptor> configure) => configure.Invoke(this);
+
 	public MoreLikeThisQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private double? BoostTermsValue { get; set; }
-
 	private bool? FailOnUnsupportedFieldValue { get; set; }
-
 	private Fields? FieldsValue { get; set; }
-
 	private bool? IncludeValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Like> LikeValue { get; set; }
-
 	private int? MaxDocFreqValue { get; set; }
-
 	private int? MaxQueryTermsValue { get; set; }
-
 	private int? MaxWordLengthValue { get; set; }
-
 	private int? MinDocFreqValue { get; set; }
-
 	private int? MinTermFreqValue { get; set; }
-
 	private int? MinWordLengthValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private IDictionary<Elastic.Clients.Elasticsearch.Field, string>? PerFieldAnalyzerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private ICollection<string>? StopWordsValue { get; set; }
-
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.Like>? UnlikeValue { get; set; }
-
 	private long? VersionValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.VersionType? VersionTypeValue { get; set; }
 
 	public MoreLikeThisQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs
index b12e02c5892..da7ea968722 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/MultiMatchQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,61 +25,44 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class MultiMatchQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Elastic.Clients.Elasticsearch.Fields? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzziness")]
 	public Elastic.Clients.Elasticsearch.Fuzziness? Fuzziness { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzzy_rewrite")]
 	public string? FuzzyRewrite { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzzy_transpositions")]
 	public bool? FuzzyTranspositions { get; set; }
-
 	[JsonInclude, JsonPropertyName("lenient")]
 	public bool? Lenient { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_expansions")]
 	public int? MaxExpansions { get; set; }
-
 	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
-
 	[JsonInclude, JsonPropertyName("operator")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? Operator { get; set; }
-
 	[JsonInclude, JsonPropertyName("prefix_length")]
 	public int? PrefixLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("slop")]
 	public int? Slop { get; set; }
-
 	[JsonInclude, JsonPropertyName("tie_breaker")]
 	public double? TieBreaker { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.TextQueryType? Type { get; set; }
-
 	[JsonInclude, JsonPropertyName("zero_terms_query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQuery { get; set; }
 
@@ -87,44 +72,28 @@ public sealed partial class MultiMatchQuery : SearchQuery
 public sealed partial class MultiMatchQueryDescriptor<TDocument> : SerializableDescriptor<MultiMatchQueryDescriptor<TDocument>>
 {
 	internal MultiMatchQueryDescriptor(Action<MultiMatchQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public MultiMatchQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private bool? AutoGenerateSynonymsPhraseQueryValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? FieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private string? FuzzyRewriteValue { get; set; }
-
 	private bool? FuzzyTranspositionsValue { get; set; }
-
 	private bool? LenientValue { get; set; }
-
 	private int? MaxExpansionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Operator? OperatorValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private int? SlopValue { get; set; }
-
 	private double? TieBreakerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.TextQueryType? TypeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQueryValue { get; set; }
 
 	public MultiMatchQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -349,44 +318,28 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class MultiMatchQueryDescriptor : SerializableDescriptor<MultiMatchQueryDescriptor>
 {
 	internal MultiMatchQueryDescriptor(Action<MultiMatchQueryDescriptor> configure) => configure.Invoke(this);
+
 	public MultiMatchQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private bool? AutoGenerateSynonymsPhraseQueryValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fields? FieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private string? FuzzyRewriteValue { get; set; }
-
 	private bool? FuzzyTranspositionsValue { get; set; }
-
 	private bool? LenientValue { get; set; }
-
 	private int? MaxExpansionsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Operator? OperatorValue { get; set; }
-
 	private int? PrefixLengthValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private int? SlopValue { get; set; }
-
 	private double? TieBreakerValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.TextQueryType? TypeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ZeroTermsQuery? ZeroTermsQueryValue { get; set; }
 
 	public MultiMatchQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NestedQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NestedQuery.g.cs
index f85c4cd2f67..5b83cc38ea1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NestedQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NestedQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class NestedQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_unmapped")]
 	public bool? IgnoreUnmapped { get; set; }
-
 	[JsonInclude, JsonPropertyName("inner_hits")]
 	public Elastic.Clients.Elasticsearch.Core.Search.InnerHits? InnerHits { get; set; }
-
 	[JsonInclude, JsonPropertyName("path")]
 	public Elastic.Clients.Elasticsearch.Field Path { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("score_mode")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.ChildScoreMode? ScoreMode { get; set; }
 
@@ -54,30 +50,21 @@ public sealed partial class NestedQuery : SearchQuery
 public sealed partial class NestedQueryDescriptor<TDocument> : SerializableDescriptor<NestedQueryDescriptor<TDocument>>
 {
 	internal NestedQueryDescriptor(Action<NestedQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public NestedQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.InnerHits? InnerHitsValue { get; set; }
-
 	private Core.Search.InnerHitsDescriptor<TDocument> InnerHitsDescriptor { get; set; }
-
 	private Action<Core.Search.InnerHitsDescriptor<TDocument>> InnerHitsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field PathValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ChildScoreMode? ScoreModeValue { get; set; }
 
 	public NestedQueryDescriptor<TDocument> InnerHits(Elastic.Clients.Elasticsearch.Core.Search.InnerHits? innerHits)
@@ -232,30 +219,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class NestedQueryDescriptor : SerializableDescriptor<NestedQueryDescriptor>
 {
 	internal NestedQueryDescriptor(Action<NestedQueryDescriptor> configure) => configure.Invoke(this);
+
 	public NestedQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Core.Search.InnerHits? InnerHitsValue { get; set; }
-
 	private Core.Search.InnerHitsDescriptor InnerHitsDescriptor { get; set; }
-
 	private Action<Core.Search.InnerHitsDescriptor> InnerHitsDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field PathValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.ChildScoreMode? ScoreModeValue { get; set; }
 
 	public NestedQueryDescriptor InnerHits(Elastic.Clients.Elasticsearch.Core.Search.InnerHits? innerHits)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs
index 251e039e9ab..21510da8d69 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/NumberRangeQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class NumberRangeQueryConverter : JsonConverter<NumberRangeQuery>
 {
 	public override NumberRangeQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -183,23 +185,14 @@ public NumberRangeQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public double? From { get; set; }
-
 	public double? Gt { get; set; }
-
 	public double? Gte { get; set; }
-
 	public double? Lt { get; set; }
-
 	public double? Lte { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? Relation { get; set; }
-
 	public double? To { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(NumberRangeQuery numberRangeQuery) => QueryDsl.Query.Range(numberRangeQuery);
@@ -208,6 +201,7 @@ public NumberRangeQuery(Field field)
 public sealed partial class NumberRangeQueryDescriptor<TDocument> : SerializableDescriptor<NumberRangeQueryDescriptor<TDocument>>
 {
 	internal NumberRangeQueryDescriptor(Action<NumberRangeQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal NumberRangeQueryDescriptor() : base()
 	{
 	}
@@ -227,23 +221,14 @@ public NumberRangeQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private double? FromValue { get; set; }
-
 	private double? GtValue { get; set; }
-
 	private double? GteValue { get; set; }
-
 	private double? LtValue { get; set; }
-
 	private double? LteValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? RelationValue { get; set; }
-
 	private double? ToValue { get; set; }
 
 	public NumberRangeQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -381,6 +366,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class NumberRangeQueryDescriptor : SerializableDescriptor<NumberRangeQueryDescriptor>
 {
 	internal NumberRangeQueryDescriptor(Action<NumberRangeQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal NumberRangeQueryDescriptor() : base()
 	{
 	}
@@ -393,23 +379,14 @@ public NumberRangeQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private double? FromValue { get; set; }
-
 	private double? GtValue { get; set; }
-
 	private double? GteValue { get; set; }
-
 	private double? LtValue { get; set; }
-
 	private double? LteValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RangeRelation? RelationValue { get; set; }
-
 	private double? ToValue { get; set; }
 
 	public NumberRangeQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ParentIdQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ParentIdQuery.g.cs
index 74836c98a70..dfd39b0994e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ParentIdQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ParentIdQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class ParentIdQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public Elastic.Clients.Elasticsearch.Id? Id { get; set; }
-
 	[JsonInclude, JsonPropertyName("ignore_unmapped")]
 	public bool? IgnoreUnmapped { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string? Type { get; set; }
 
@@ -48,18 +46,15 @@ public sealed partial class ParentIdQuery : SearchQuery
 public sealed partial class ParentIdQueryDescriptor : SerializableDescriptor<ParentIdQueryDescriptor>
 {
 	internal ParentIdQueryDescriptor(Action<ParentIdQueryDescriptor> configure) => configure.Invoke(this);
+
 	public ParentIdQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id? IdValue { get; set; }
-
 	private bool? IgnoreUnmappedValue { get; set; }
-
 	private string? TypeValue { get; set; }
 
 	public ParentIdQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PercolateQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PercolateQuery.g.cs
index 6c662959b8e..5fd27a12eda 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PercolateQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PercolateQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,40 +25,30 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class PercolateQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("document")]
 	public object? Document { get; set; }
-
 	[JsonInclude, JsonPropertyName("documents")]
 	public ICollection<object>? Documents { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public Elastic.Clients.Elasticsearch.Id? Id { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.IndexName? Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public string? Name { get; set; }
-
 	[JsonInclude, JsonPropertyName("preference")]
 	public string? Preference { get; set; }
-
 	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
-
 	[JsonInclude, JsonPropertyName("version")]
 	public long? Version { get; set; }
 
@@ -66,30 +58,21 @@ public sealed partial class PercolateQuery : SearchQuery
 public sealed partial class PercolateQueryDescriptor<TDocument> : SerializableDescriptor<PercolateQueryDescriptor<TDocument>>
 {
 	internal PercolateQueryDescriptor(Action<PercolateQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PercolateQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private object? DocumentValue { get; set; }
-
 	private ICollection<object>? DocumentsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id? IdValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName? IndexValue { get; set; }
-
 	private string? NameValue { get; set; }
-
 	private string? PreferenceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private long? VersionValue { get; set; }
 
 	public PercolateQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -236,30 +219,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class PercolateQueryDescriptor : SerializableDescriptor<PercolateQueryDescriptor>
 {
 	internal PercolateQueryDescriptor(Action<PercolateQueryDescriptor> configure) => configure.Invoke(this);
+
 	public PercolateQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private object? DocumentValue { get; set; }
-
 	private ICollection<object>? DocumentsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id? IdValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName? IndexValue { get; set; }
-
 	private string? NameValue { get; set; }
-
 	private string? PreferenceValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
-
 	private long? VersionValue { get; set; }
 
 	public PercolateQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PrefixQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PrefixQuery.g.cs
index cae914f5aab..26134706ec1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PrefixQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/PrefixQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class PrefixQueryConverter : JsonConverter<PrefixQuery>
 {
 	public override PrefixQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -131,15 +133,10 @@ public PrefixQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public bool? CaseInsensitive { get; set; }
-
 	public string? Rewrite { get; set; }
-
 	public string Value { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(PrefixQuery prefixQuery) => QueryDsl.Query.Prefix(prefixQuery);
@@ -148,6 +145,7 @@ public PrefixQuery(Field field)
 public sealed partial class PrefixQueryDescriptor<TDocument> : SerializableDescriptor<PrefixQueryDescriptor<TDocument>>
 {
 	internal PrefixQueryDescriptor(Action<PrefixQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal PrefixQueryDescriptor() : base()
 	{
 	}
@@ -167,15 +165,10 @@ public PrefixQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? CaseInsensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? RewriteValue { get; set; }
-
 	private string ValueValue { get; set; }
 
 	public PrefixQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -261,6 +254,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class PrefixQueryDescriptor : SerializableDescriptor<PrefixQueryDescriptor>
 {
 	internal PrefixQueryDescriptor(Action<PrefixQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal PrefixQueryDescriptor() : base()
 	{
 	}
@@ -273,15 +267,10 @@ public PrefixQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? CaseInsensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? RewriteValue { get; set; }
-
 	private string ValueValue { get; set; }
 
 	public PrefixQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Query.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Query.g.cs
index 380fd0342e9..71cb89a76af 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Query.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/Query.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 [JsonConverter(typeof(QueryConverter))]
 public sealed partial class Query
 {
@@ -41,7 +43,6 @@ internal Query(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static Query Bool(Elastic.Clients.Elasticsearch.QueryDsl.BoolQuery boolQuery) => new Query("bool", boolQuery);
@@ -626,20 +627,17 @@ public override void Write(Utf8JsonWriter writer, Query value, JsonSerializerOpt
 public sealed partial class QueryDescriptor<TDocument> : SerializableDescriptor<QueryDescriptor<TDocument>>
 {
 	internal QueryDescriptor(Action<QueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public QueryDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private QueryDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private QueryDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -754,6 +752,7 @@ private QueryDescriptor<TDocument> Set(object variant, string variantName)
 	public QueryDescriptor<TDocument> Wildcard(Action<WildcardQueryDescriptor<TDocument>> configure) => Set(configure, "wildcard");
 	public QueryDescriptor<TDocument> Wrapper(WrapperQuery wrapperQuery) => Set(wrapperQuery, "wrapper");
 	public QueryDescriptor<TDocument> Wrapper(Action<WrapperQueryDescriptor> configure) => Set(configure, "wrapper");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -785,20 +784,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class QueryDescriptor : SerializableDescriptor<QueryDescriptor>
 {
 	internal QueryDescriptor(Action<QueryDescriptor> configure) => configure.Invoke(this);
+
 	public QueryDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private QueryDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private QueryDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -955,6 +951,7 @@ private QueryDescriptor Set(object variant, string variantName)
 	public QueryDescriptor Wildcard<TDocument>(Action<WildcardQueryDescriptor<TDocument>> configure) => Set(configure, "wildcard");
 	public QueryDescriptor Wrapper(WrapperQuery wrapperQuery) => Set(wrapperQuery, "wrapper");
 	public QueryDescriptor Wrapper(Action<WrapperQueryDescriptor> configure) => Set(configure, "wrapper");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryStringQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryStringQuery.g.cs
index d7f71d50d35..8ff2a37e588 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryStringQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryStringQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,88 +25,62 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class QueryStringQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("allow_leading_wildcard")]
 	public bool? AllowLeadingWildcard { get; set; }
-
 	[JsonInclude, JsonPropertyName("analyze_wildcard")]
 	public bool? AnalyzeWildcard { get; set; }
-
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("default_field")]
 	public Elastic.Clients.Elasticsearch.Field? DefaultField { get; set; }
-
 	[JsonInclude, JsonPropertyName("default_operator")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get; set; }
-
 	[JsonInclude, JsonPropertyName("enable_position_increments")]
 	public bool? EnablePositionIncrements { get; set; }
-
 	[JsonInclude, JsonPropertyName("escape")]
 	public bool? Escape { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Fields? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzziness")]
 	public Elastic.Clients.Elasticsearch.Fuzziness? Fuzziness { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzzy_max_expansions")]
 	public int? FuzzyMaxExpansions { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzzy_prefix_length")]
 	public int? FuzzyPrefixLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzzy_rewrite")]
 	public string? FuzzyRewrite { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzzy_transpositions")]
 	public bool? FuzzyTranspositions { get; set; }
-
 	[JsonInclude, JsonPropertyName("lenient")]
 	public bool? Lenient { get; set; }
-
 	[JsonInclude, JsonPropertyName("max_determinized_states")]
 	public int? MaxDeterminizedStates { get; set; }
-
 	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
-
 	[JsonInclude, JsonPropertyName("phrase_slop")]
 	public double? PhraseSlop { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("quote_analyzer")]
 	public string? QuoteAnalyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("quote_field_suffix")]
 	public string? QuoteFieldSuffix { get; set; }
-
 	[JsonInclude, JsonPropertyName("rewrite")]
 	public string? Rewrite { get; set; }
-
 	[JsonInclude, JsonPropertyName("tie_breaker")]
 	public double? TieBreaker { get; set; }
-
 	[JsonInclude, JsonPropertyName("time_zone")]
 	public string? TimeZone { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.TextQueryType? Type { get; set; }
 
@@ -114,62 +90,37 @@ public sealed partial class QueryStringQuery : SearchQuery
 public sealed partial class QueryStringQueryDescriptor<TDocument> : SerializableDescriptor<QueryStringQueryDescriptor<TDocument>>
 {
 	internal QueryStringQueryDescriptor(Action<QueryStringQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public QueryStringQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private bool? AllowLeadingWildcardValue { get; set; }
-
 	private bool? AnalyzeWildcardValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private bool? AutoGenerateSynonymsPhraseQueryValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? DefaultFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperatorValue { get; set; }
-
 	private bool? EnablePositionIncrementsValue { get; set; }
-
 	private bool? EscapeValue { get; set; }
-
 	private Fields? FieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private int? FuzzyMaxExpansionsValue { get; set; }
-
 	private int? FuzzyPrefixLengthValue { get; set; }
-
 	private string? FuzzyRewriteValue { get; set; }
-
 	private bool? FuzzyTranspositionsValue { get; set; }
-
 	private bool? LenientValue { get; set; }
-
 	private int? MaxDeterminizedStatesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private double? PhraseSlopValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private string? QuoteAnalyzerValue { get; set; }
-
 	private string? QuoteFieldSuffixValue { get; set; }
-
 	private string? RewriteValue { get; set; }
-
 	private double? TieBreakerValue { get; set; }
-
 	private string? TimeZoneValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.TextQueryType? TypeValue { get; set; }
 
 	public QueryStringQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -508,62 +459,37 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class QueryStringQueryDescriptor : SerializableDescriptor<QueryStringQueryDescriptor>
 {
 	internal QueryStringQueryDescriptor(Action<QueryStringQueryDescriptor> configure) => configure.Invoke(this);
+
 	public QueryStringQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private bool? AllowLeadingWildcardValue { get; set; }
-
 	private bool? AnalyzeWildcardValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private bool? AutoGenerateSynonymsPhraseQueryValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? DefaultFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperatorValue { get; set; }
-
 	private bool? EnablePositionIncrementsValue { get; set; }
-
 	private bool? EscapeValue { get; set; }
-
 	private Fields? FieldsValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Fuzziness? FuzzinessValue { get; set; }
-
 	private int? FuzzyMaxExpansionsValue { get; set; }
-
 	private int? FuzzyPrefixLengthValue { get; set; }
-
 	private string? FuzzyRewriteValue { get; set; }
-
 	private bool? FuzzyTranspositionsValue { get; set; }
-
 	private bool? LenientValue { get; set; }
-
 	private int? MaxDeterminizedStatesValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private double? PhraseSlopValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private string? QuoteAnalyzerValue { get; set; }
-
 	private string? QuoteFieldSuffixValue { get; set; }
-
 	private string? RewriteValue { get; set; }
-
 	private double? TieBreakerValue { get; set; }
-
 	private string? TimeZoneValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.TextQueryType? TypeValue { get; set; }
 
 	public QueryStringQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RandomScoreFunction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RandomScoreFunction.g.cs
index 082aafe593d..11d66938cea 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RandomScoreFunction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RandomScoreFunction.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class RandomScoreFunction
 {
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("seed")]
 	public Union<long?, string?>? Seed { get; set; }
 
@@ -39,12 +40,12 @@ public sealed partial class RandomScoreFunction
 public sealed partial class RandomScoreFunctionDescriptor<TDocument> : SerializableDescriptor<RandomScoreFunctionDescriptor<TDocument>>
 {
 	internal RandomScoreFunctionDescriptor(Action<RandomScoreFunctionDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RandomScoreFunctionDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private Union<long?, string?>? SeedValue { get; set; }
 
 	public RandomScoreFunctionDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -87,12 +88,12 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RandomScoreFunctionDescriptor : SerializableDescriptor<RandomScoreFunctionDescriptor>
 {
 	internal RandomScoreFunctionDescriptor(Action<RandomScoreFunctionDescriptor> configure) => configure.Invoke(this);
+
 	public RandomScoreFunctionDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private Union<long?, string?>? SeedValue { get; set; }
 
 	public RandomScoreFunctionDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionLinear.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionLinear.g.cs
index 4543d43852c..c5cc7d94116 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionLinear.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionLinear.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class RankFeatureFunctionLinear
 {
 }
@@ -32,6 +34,7 @@ public sealed partial class RankFeatureFunctionLinear
 public sealed partial class RankFeatureFunctionLinearDescriptor : SerializableDescriptor<RankFeatureFunctionLinearDescriptor>
 {
 	internal RankFeatureFunctionLinearDescriptor(Action<RankFeatureFunctionLinearDescriptor> configure) => configure.Invoke(this);
+
 	public RankFeatureFunctionLinearDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionLogarithm.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionLogarithm.g.cs
index 8e217d7d0fa..d7dc4bc6ad7 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionLogarithm.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionLogarithm.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class RankFeatureFunctionLogarithm
 {
 	[JsonInclude, JsonPropertyName("scaling_factor")]
@@ -34,6 +36,7 @@ public sealed partial class RankFeatureFunctionLogarithm
 public sealed partial class RankFeatureFunctionLogarithmDescriptor : SerializableDescriptor<RankFeatureFunctionLogarithmDescriptor>
 {
 	internal RankFeatureFunctionLogarithmDescriptor(Action<RankFeatureFunctionLogarithmDescriptor> configure) => configure.Invoke(this);
+
 	public RankFeatureFunctionLogarithmDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionSaturation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionSaturation.g.cs
index 13fe5a1aa94..bda1106eced 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionSaturation.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionSaturation.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class RankFeatureFunctionSaturation
 {
 	[JsonInclude, JsonPropertyName("pivot")]
@@ -34,6 +36,7 @@ public sealed partial class RankFeatureFunctionSaturation
 public sealed partial class RankFeatureFunctionSaturationDescriptor : SerializableDescriptor<RankFeatureFunctionSaturationDescriptor>
 {
 	internal RankFeatureFunctionSaturationDescriptor(Action<RankFeatureFunctionSaturationDescriptor> configure) => configure.Invoke(this);
+
 	public RankFeatureFunctionSaturationDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionSigmoid.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionSigmoid.g.cs
index b974b207191..3a62f0da30f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionSigmoid.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureFunctionSigmoid.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class RankFeatureFunctionSigmoid
 {
 	[JsonInclude, JsonPropertyName("exponent")]
 	public float Exponent { get; set; }
-
 	[JsonInclude, JsonPropertyName("pivot")]
 	public float Pivot { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class RankFeatureFunctionSigmoid
 public sealed partial class RankFeatureFunctionSigmoidDescriptor : SerializableDescriptor<RankFeatureFunctionSigmoidDescriptor>
 {
 	internal RankFeatureFunctionSigmoidDescriptor(Action<RankFeatureFunctionSigmoidDescriptor> configure) => configure.Invoke(this);
+
 	public RankFeatureFunctionSigmoidDescriptor() : base()
 	{
 	}
 
 	private float ExponentValue { get; set; }
-
 	private float PivotValue { get; set; }
 
 	public RankFeatureFunctionSigmoidDescriptor Exponent(float exponent)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureQuery.g.cs
index f2aa63b4772..1a7e8847152 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RankFeatureQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class RankFeatureQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("linear")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionLinear? Linear { get; set; }
-
 	[JsonInclude, JsonPropertyName("log")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionLogarithm? Log { get; set; }
-
 	[JsonInclude, JsonPropertyName("saturation")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionSaturation? Saturation { get; set; }
-
 	[JsonInclude, JsonPropertyName("sigmoid")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionSigmoid? Sigmoid { get; set; }
 
@@ -54,38 +50,25 @@ public sealed partial class RankFeatureQuery : SearchQuery
 public sealed partial class RankFeatureQueryDescriptor<TDocument> : SerializableDescriptor<RankFeatureQueryDescriptor<TDocument>>
 {
 	internal RankFeatureQueryDescriptor(Action<RankFeatureQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public RankFeatureQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionLinear? LinearValue { get; set; }
-
 	private RankFeatureFunctionLinearDescriptor LinearDescriptor { get; set; }
-
 	private Action<RankFeatureFunctionLinearDescriptor> LinearDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionLogarithm? LogValue { get; set; }
-
 	private RankFeatureFunctionLogarithmDescriptor LogDescriptor { get; set; }
-
 	private Action<RankFeatureFunctionLogarithmDescriptor> LogDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionSaturation? SaturationValue { get; set; }
-
 	private RankFeatureFunctionSaturationDescriptor SaturationDescriptor { get; set; }
-
 	private Action<RankFeatureFunctionSaturationDescriptor> SaturationDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionSigmoid? SigmoidValue { get; set; }
-
 	private RankFeatureFunctionSigmoidDescriptor SigmoidDescriptor { get; set; }
-
 	private Action<RankFeatureFunctionSigmoidDescriptor> SigmoidDescriptorAction { get; set; }
 
 	public RankFeatureQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -296,38 +279,25 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RankFeatureQueryDescriptor : SerializableDescriptor<RankFeatureQueryDescriptor>
 {
 	internal RankFeatureQueryDescriptor(Action<RankFeatureQueryDescriptor> configure) => configure.Invoke(this);
+
 	public RankFeatureQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionLinear? LinearValue { get; set; }
-
 	private RankFeatureFunctionLinearDescriptor LinearDescriptor { get; set; }
-
 	private Action<RankFeatureFunctionLinearDescriptor> LinearDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionLogarithm? LogValue { get; set; }
-
 	private RankFeatureFunctionLogarithmDescriptor LogDescriptor { get; set; }
-
 	private Action<RankFeatureFunctionLogarithmDescriptor> LogDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionSaturation? SaturationValue { get; set; }
-
 	private RankFeatureFunctionSaturationDescriptor SaturationDescriptor { get; set; }
-
 	private Action<RankFeatureFunctionSaturationDescriptor> SaturationDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.RankFeatureFunctionSigmoid? SigmoidValue { get; set; }
-
 	private RankFeatureFunctionSigmoidDescriptor SigmoidDescriptor { get; set; }
-
 	private Action<RankFeatureFunctionSigmoidDescriptor> SigmoidDescriptorAction { get; set; }
 
 	public RankFeatureQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RegexpQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RegexpQuery.g.cs
index 4c6d1dbae04..750db9bc878 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RegexpQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/RegexpQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class RegexpQueryConverter : JsonConverter<RegexpQuery>
 {
 	public override RegexpQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -155,19 +157,12 @@ public RegexpQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public bool? CaseInsensitive { get; set; }
-
 	public string? Flags { get; set; }
-
 	public int? MaxDeterminizedStates { get; set; }
-
 	public string? Rewrite { get; set; }
-
 	public string Value { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(RegexpQuery regexpQuery) => QueryDsl.Query.Regexp(regexpQuery);
@@ -176,6 +171,7 @@ public RegexpQuery(Field field)
 public sealed partial class RegexpQueryDescriptor<TDocument> : SerializableDescriptor<RegexpQueryDescriptor<TDocument>>
 {
 	internal RegexpQueryDescriptor(Action<RegexpQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal RegexpQueryDescriptor() : base()
 	{
 	}
@@ -195,19 +191,12 @@ public RegexpQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? CaseInsensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? FlagsValue { get; set; }
-
 	private int? MaxDeterminizedStatesValue { get; set; }
-
 	private string? RewriteValue { get; set; }
-
 	private string ValueValue { get; set; }
 
 	public RegexpQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -317,6 +306,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class RegexpQueryDescriptor : SerializableDescriptor<RegexpQueryDescriptor>
 {
 	internal RegexpQueryDescriptor(Action<RegexpQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal RegexpQueryDescriptor() : base()
 	{
 	}
@@ -329,19 +319,12 @@ public RegexpQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? CaseInsensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? FlagsValue { get; set; }
-
 	private int? MaxDeterminizedStatesValue { get; set; }
-
 	private string? RewriteValue { get; set; }
-
 	private string ValueValue { get; set; }
 
 	public RegexpQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptQuery.g.cs
index 50a3c2103c6..04a7f94197b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class ScriptQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script Script { get; set; }
 
@@ -42,14 +42,13 @@ public sealed partial class ScriptQuery : SearchQuery
 public sealed partial class ScriptQueryDescriptor : SerializableDescriptor<ScriptQueryDescriptor>
 {
 	internal ScriptQueryDescriptor(Action<ScriptQueryDescriptor> configure) => configure.Invoke(this);
+
 	public ScriptQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script ScriptValue { get; set; }
 
 	public ScriptQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreFunction.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreFunction.g.cs
index 035ace265bd..e202ba99a79 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreFunction.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreFunction.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class ScriptScoreFunction
 {
 	[JsonInclude, JsonPropertyName("script")]
@@ -36,6 +38,7 @@ public sealed partial class ScriptScoreFunction
 public sealed partial class ScriptScoreFunctionDescriptor : SerializableDescriptor<ScriptScoreFunctionDescriptor>
 {
 	internal ScriptScoreFunctionDescriptor(Action<ScriptScoreFunctionDescriptor> configure) => configure.Invoke(this);
+
 	public ScriptScoreFunctionDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreQuery.g.cs
index 27f3889efda..de3e570abb8 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/ScriptScoreQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class ScriptScoreQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("min_score")]
 	public float? MinScore { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script Script { get; set; }
 
@@ -48,22 +46,17 @@ public sealed partial class ScriptScoreQuery : SearchQuery
 public sealed partial class ScriptScoreQueryDescriptor<TDocument> : SerializableDescriptor<ScriptScoreQueryDescriptor<TDocument>>
 {
 	internal ScriptScoreQueryDescriptor(Action<ScriptScoreQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ScriptScoreQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private float? MinScoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script ScriptValue { get; set; }
 
 	public ScriptScoreQueryDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query)
@@ -160,22 +153,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ScriptScoreQueryDescriptor : SerializableDescriptor<ScriptScoreQueryDescriptor>
 {
 	internal ScriptScoreQueryDescriptor(Action<ScriptScoreQueryDescriptor> configure) => configure.Invoke(this);
+
 	public ScriptScoreQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query QueryValue { get; set; }
-
 	private QueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<QueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private float? MinScoreValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script ScriptValue { get; set; }
 
 	public ScriptScoreQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.Query query)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs
index e407055db1a..93742be03bc 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SimpleQueryStringQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,49 +25,36 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class SimpleQueryStringQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("analyze_wildcard")]
 	public bool? AnalyzeWildcard { get; set; }
-
 	[JsonInclude, JsonPropertyName("analyzer")]
 	public string? Analyzer { get; set; }
-
 	[JsonInclude, JsonPropertyName("auto_generate_synonyms_phrase_query")]
 	public bool? AutoGenerateSynonymsPhraseQuery { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("default_operator")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperator { get; set; }
-
 	[JsonInclude, JsonPropertyName("fields")]
 	public Fields? Fields { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzzy_max_expansions")]
 	public int? FuzzyMaxExpansions { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzzy_prefix_length")]
 	public int? FuzzyPrefixLength { get; set; }
-
 	[JsonInclude, JsonPropertyName("fuzzy_transpositions")]
 	public bool? FuzzyTranspositions { get; set; }
-
 	[JsonInclude, JsonPropertyName("lenient")]
 	public bool? Lenient { get; set; }
-
 	[JsonInclude, JsonPropertyName("minimum_should_match")]
 	public Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatch { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
-
 	[JsonInclude, JsonPropertyName("quote_field_suffix")]
 	public string? QuoteFieldSuffix { get; set; }
 
@@ -75,36 +64,24 @@ public sealed partial class SimpleQueryStringQuery : SearchQuery
 public sealed partial class SimpleQueryStringQueryDescriptor<TDocument> : SerializableDescriptor<SimpleQueryStringQueryDescriptor<TDocument>>
 {
 	internal SimpleQueryStringQueryDescriptor(Action<SimpleQueryStringQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SimpleQueryStringQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private bool? AnalyzeWildcardValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private bool? AutoGenerateSynonymsPhraseQueryValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperatorValue { get; set; }
-
 	private Fields? FieldsValue { get; set; }
-
 	private int? FuzzyMaxExpansionsValue { get; set; }
-
 	private int? FuzzyPrefixLengthValue { get; set; }
-
 	private bool? FuzzyTranspositionsValue { get; set; }
-
 	private bool? LenientValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private string? QuoteFieldSuffixValue { get; set; }
 
 	public SimpleQueryStringQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -281,36 +258,24 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SimpleQueryStringQueryDescriptor : SerializableDescriptor<SimpleQueryStringQueryDescriptor>
 {
 	internal SimpleQueryStringQueryDescriptor(Action<SimpleQueryStringQueryDescriptor> configure) => configure.Invoke(this);
+
 	public SimpleQueryStringQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private bool? AnalyzeWildcardValue { get; set; }
-
 	private string? AnalyzerValue { get; set; }
-
 	private bool? AutoGenerateSynonymsPhraseQueryValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.Operator? DefaultOperatorValue { get; set; }
-
 	private Fields? FieldsValue { get; set; }
-
 	private int? FuzzyMaxExpansionsValue { get; set; }
-
 	private int? FuzzyPrefixLengthValue { get; set; }
-
 	private bool? FuzzyTranspositionsValue { get; set; }
-
 	private bool? LenientValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.MinimumShouldMatch? MinimumShouldMatchValue { get; set; }
-
 	private string QueryValue { get; set; }
-
 	private string? QuoteFieldSuffixValue { get; set; }
 
 	public SimpleQueryStringQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanContainingQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanContainingQuery.g.cs
index dbf66b86ca4..a220106e57e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanContainingQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanContainingQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class SpanContainingQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("big")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery Big { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("little")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery Little { get; set; }
 }
@@ -43,24 +42,18 @@ public sealed partial class SpanContainingQuery : SearchQuery
 public sealed partial class SpanContainingQueryDescriptor<TDocument> : SerializableDescriptor<SpanContainingQueryDescriptor<TDocument>>
 {
 	internal SpanContainingQueryDescriptor(Action<SpanContainingQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SpanContainingQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery BigValue { get; set; }
-
 	private SpanQueryDescriptor<TDocument> BigDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>> BigDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery LittleValue { get; set; }
-
 	private SpanQueryDescriptor<TDocument> LittleDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>> LittleDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
 	public SpanContainingQueryDescriptor<TDocument> Big(Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery big)
@@ -177,24 +170,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SpanContainingQueryDescriptor : SerializableDescriptor<SpanContainingQueryDescriptor>
 {
 	internal SpanContainingQueryDescriptor(Action<SpanContainingQueryDescriptor> configure) => configure.Invoke(this);
+
 	public SpanContainingQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery BigValue { get; set; }
-
 	private SpanQueryDescriptor BigDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor> BigDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery LittleValue { get; set; }
-
 	private SpanQueryDescriptor LittleDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor> LittleDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
 	public SpanContainingQueryDescriptor Big(Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery big)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFieldMaskingQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFieldMaskingQuery.g.cs
index cbaf9f2d69e..993bdb17b19 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFieldMaskingQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFieldMaskingQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class SpanFieldMaskingQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("query")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery Query { get; set; }
 }
@@ -43,20 +42,16 @@ public sealed partial class SpanFieldMaskingQuery : SearchQuery
 public sealed partial class SpanFieldMaskingQueryDescriptor<TDocument> : SerializableDescriptor<SpanFieldMaskingQueryDescriptor<TDocument>>
 {
 	internal SpanFieldMaskingQueryDescriptor(Action<SpanFieldMaskingQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SpanFieldMaskingQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery QueryValue { get; set; }
-
 	private SpanQueryDescriptor<TDocument> QueryDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
 
 	public SpanFieldMaskingQueryDescriptor<TDocument> Query(Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery query)
@@ -147,20 +142,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SpanFieldMaskingQueryDescriptor : SerializableDescriptor<SpanFieldMaskingQueryDescriptor>
 {
 	internal SpanFieldMaskingQueryDescriptor(Action<SpanFieldMaskingQueryDescriptor> configure) => configure.Invoke(this);
+
 	public SpanFieldMaskingQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery QueryValue { get; set; }
-
 	private SpanQueryDescriptor QueryDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor> QueryDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
 
 	public SpanFieldMaskingQueryDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery query)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFirstQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFirstQuery.g.cs
index daa9cd03a3b..8e299a31c99 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFirstQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanFirstQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class SpanFirstQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("end")]
 	public int End { get; set; }
-
 	[JsonInclude, JsonPropertyName("match")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery Match { get; set; }
 }
@@ -43,20 +42,16 @@ public sealed partial class SpanFirstQuery : SearchQuery
 public sealed partial class SpanFirstQueryDescriptor<TDocument> : SerializableDescriptor<SpanFirstQueryDescriptor<TDocument>>
 {
 	internal SpanFirstQueryDescriptor(Action<SpanFirstQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SpanFirstQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery MatchValue { get; set; }
-
 	private SpanQueryDescriptor<TDocument> MatchDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>> MatchDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private int EndValue { get; set; }
 
 	public SpanFirstQueryDescriptor<TDocument> Match(Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery match)
@@ -141,20 +136,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SpanFirstQueryDescriptor : SerializableDescriptor<SpanFirstQueryDescriptor>
 {
 	internal SpanFirstQueryDescriptor(Action<SpanFirstQueryDescriptor> configure) => configure.Invoke(this);
+
 	public SpanFirstQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery MatchValue { get; set; }
-
 	private SpanQueryDescriptor MatchDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor> MatchDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private int EndValue { get; set; }
 
 	public SpanFirstQueryDescriptor Match(Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery match)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanMultiTermQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanMultiTermQuery.g.cs
index 4ef67bb64ac..cce64064e3e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanMultiTermQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanMultiTermQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class SpanMultiTermQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
+	/// <summary>
+	/// <para>Should be a multi term query (one of wildcard, fuzzy, prefix, range or regexp query)</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("match")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.Query Match { get; set; }
 }
@@ -40,20 +44,20 @@ public sealed partial class SpanMultiTermQuery : SearchQuery
 public sealed partial class SpanMultiTermQueryDescriptor<TDocument> : SerializableDescriptor<SpanMultiTermQueryDescriptor<TDocument>>
 {
 	internal SpanMultiTermQueryDescriptor(Action<SpanMultiTermQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SpanMultiTermQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query MatchValue { get; set; }
-
 	private QueryDescriptor<TDocument> MatchDescriptor { get; set; }
-
 	private Action<QueryDescriptor<TDocument>> MatchDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
+	/// <summary>
+	/// <para>Should be a multi term query (one of wildcard, fuzzy, prefix, range or regexp query)</para>
+	/// </summary>
 	public SpanMultiTermQueryDescriptor<TDocument> Match(Elastic.Clients.Elasticsearch.QueryDsl.Query match)
 	{
 		MatchDescriptor = null;
@@ -128,20 +132,20 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SpanMultiTermQueryDescriptor : SerializableDescriptor<SpanMultiTermQueryDescriptor>
 {
 	internal SpanMultiTermQueryDescriptor(Action<SpanMultiTermQueryDescriptor> configure) => configure.Invoke(this);
+
 	public SpanMultiTermQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.Query MatchValue { get; set; }
-
 	private QueryDescriptor MatchDescriptor { get; set; }
-
 	private Action<QueryDescriptor> MatchDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
+	/// <summary>
+	/// <para>Should be a multi term query (one of wildcard, fuzzy, prefix, range or regexp query)</para>
+	/// </summary>
 	public SpanMultiTermQueryDescriptor Match(Elastic.Clients.Elasticsearch.QueryDsl.Query match)
 	{
 		MatchDescriptor = null;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNearQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNearQuery.g.cs
index 59d36b0e480..99c856fb061 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNearQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNearQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class SpanNearQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("clauses")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery> Clauses { get; set; }
-
 	[JsonInclude, JsonPropertyName("in_order")]
 	public bool? InOrder { get; set; }
-
 	[JsonInclude, JsonPropertyName("slop")]
 	public int? Slop { get; set; }
 }
@@ -46,24 +44,18 @@ public sealed partial class SpanNearQuery : SearchQuery
 public sealed partial class SpanNearQueryDescriptor<TDocument> : SerializableDescriptor<SpanNearQueryDescriptor<TDocument>>
 {
 	internal SpanNearQueryDescriptor(Action<SpanNearQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SpanNearQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery> ClausesValue { get; set; }
-
 	private SpanQueryDescriptor<TDocument> ClausesDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>> ClausesDescriptorAction { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>>[] ClausesDescriptorActions { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? InOrderValue { get; set; }
-
 	private int? SlopValue { get; set; }
 
 	public SpanNearQueryDescriptor<TDocument> Clauses(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery> clauses)
@@ -191,24 +183,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SpanNearQueryDescriptor : SerializableDescriptor<SpanNearQueryDescriptor>
 {
 	internal SpanNearQueryDescriptor(Action<SpanNearQueryDescriptor> configure) => configure.Invoke(this);
+
 	public SpanNearQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery> ClausesValue { get; set; }
-
 	private SpanQueryDescriptor ClausesDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor> ClausesDescriptorAction { get; set; }
-
 	private Action<SpanQueryDescriptor>[] ClausesDescriptorActions { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? InOrderValue { get; set; }
-
 	private int? SlopValue { get; set; }
 
 	public SpanNearQueryDescriptor Clauses(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery> clauses)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNotQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNotQuery.g.cs
index cba89c9274a..9bded3c5647 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNotQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanNotQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class SpanNotQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("dist")]
 	public int? Dist { get; set; }
-
 	[JsonInclude, JsonPropertyName("exclude")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery Exclude { get; set; }
-
 	[JsonInclude, JsonPropertyName("include")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery Include { get; set; }
-
 	[JsonInclude, JsonPropertyName("post")]
 	public int? Post { get; set; }
-
 	[JsonInclude, JsonPropertyName("pre")]
 	public int? Pre { get; set; }
 }
@@ -52,30 +48,21 @@ public sealed partial class SpanNotQuery : SearchQuery
 public sealed partial class SpanNotQueryDescriptor<TDocument> : SerializableDescriptor<SpanNotQueryDescriptor<TDocument>>
 {
 	internal SpanNotQueryDescriptor(Action<SpanNotQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SpanNotQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery ExcludeValue { get; set; }
-
 	private SpanQueryDescriptor<TDocument> ExcludeDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>> ExcludeDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery IncludeValue { get; set; }
-
 	private SpanQueryDescriptor<TDocument> IncludeDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>> IncludeDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private int? DistValue { get; set; }
-
 	private int? PostValue { get; set; }
-
 	private int? PreValue { get; set; }
 
 	public SpanNotQueryDescriptor<TDocument> Exclude(Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery exclude)
@@ -228,30 +215,21 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SpanNotQueryDescriptor : SerializableDescriptor<SpanNotQueryDescriptor>
 {
 	internal SpanNotQueryDescriptor(Action<SpanNotQueryDescriptor> configure) => configure.Invoke(this);
+
 	public SpanNotQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery ExcludeValue { get; set; }
-
 	private SpanQueryDescriptor ExcludeDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor> ExcludeDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery IncludeValue { get; set; }
-
 	private SpanQueryDescriptor IncludeDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor> IncludeDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private int? DistValue { get; set; }
-
 	private int? PostValue { get; set; }
-
 	private int? PreValue { get; set; }
 
 	public SpanNotQueryDescriptor Exclude(Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery exclude)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanOrQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanOrQuery.g.cs
index a181d3d94a7..0c7a5d7f134 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanOrQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanOrQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class SpanOrQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("clauses")]
 	public ICollection<Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery> Clauses { get; set; }
 }
@@ -40,20 +40,16 @@ public sealed partial class SpanOrQuery : SearchQuery
 public sealed partial class SpanOrQueryDescriptor<TDocument> : SerializableDescriptor<SpanOrQueryDescriptor<TDocument>>
 {
 	internal SpanOrQueryDescriptor(Action<SpanOrQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SpanOrQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery> ClausesValue { get; set; }
-
 	private SpanQueryDescriptor<TDocument> ClausesDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>> ClausesDescriptorAction { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>>[] ClausesDescriptorActions { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
 	public SpanOrQueryDescriptor<TDocument> Clauses(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery> clauses)
@@ -157,20 +153,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SpanOrQueryDescriptor : SerializableDescriptor<SpanOrQueryDescriptor>
 {
 	internal SpanOrQueryDescriptor(Action<SpanOrQueryDescriptor> configure) => configure.Invoke(this);
+
 	public SpanOrQueryDescriptor() : base()
 	{
 	}
 
 	private ICollection<Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery> ClausesValue { get; set; }
-
 	private SpanQueryDescriptor ClausesDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor> ClausesDescriptorAction { get; set; }
-
 	private Action<SpanQueryDescriptor>[] ClausesDescriptorActions { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
 	public SpanOrQueryDescriptor Clauses(ICollection<Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery> clauses)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs
index 9f113eeecc2..0b2044dd0a6 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 [JsonConverter(typeof(SpanQueryConverter))]
 public sealed partial class SpanQuery : SearchQuery
 {
@@ -41,7 +43,6 @@ internal SpanQuery(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static SpanQuery FieldMaskingSpan(Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery spanFieldMaskingQuery) => new SpanQuery("field_masking_span", spanFieldMaskingQuery);
@@ -180,20 +181,17 @@ public override void Write(Utf8JsonWriter writer, SpanQuery value, JsonSerialize
 public sealed partial class SpanQueryDescriptor<TDocument> : SerializableDescriptor<SpanQueryDescriptor<TDocument>>
 {
 	internal SpanQueryDescriptor(Action<SpanQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SpanQueryDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private SpanQueryDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private SpanQueryDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -229,6 +227,7 @@ private SpanQueryDescriptor<TDocument> Set(object variant, string variantName)
 	public SpanQueryDescriptor<TDocument> SpanTerm(Action<SpanTermQueryDescriptor<TDocument>> configure) => Set(configure, "span_term");
 	public SpanQueryDescriptor<TDocument> SpanWithin(SpanWithinQuery spanWithinQuery) => Set(spanWithinQuery, "span_within");
 	public SpanQueryDescriptor<TDocument> SpanWithin(Action<SpanWithinQueryDescriptor<TDocument>> configure) => Set(configure, "span_within");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -254,20 +253,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SpanQueryDescriptor : SerializableDescriptor<SpanQueryDescriptor>
 {
 	internal SpanQueryDescriptor(Action<SpanQueryDescriptor> configure) => configure.Invoke(this);
+
 	public SpanQueryDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private SpanQueryDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private SpanQueryDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -312,6 +308,7 @@ private SpanQueryDescriptor Set(object variant, string variantName)
 	public SpanQueryDescriptor SpanWithin(SpanWithinQuery spanWithinQuery) => Set(spanWithinQuery, "span_within");
 	public SpanQueryDescriptor SpanWithin(Action<SpanWithinQueryDescriptor> configure) => Set(configure, "span_within");
 	public SpanQueryDescriptor SpanWithin<TDocument>(Action<SpanWithinQueryDescriptor<TDocument>> configure) => Set(configure, "span_within");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanTermQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanTermQuery.g.cs
index 57c553400a0..98d7910acd9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanTermQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanTermQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class SpanTermQueryConverter : JsonConverter<SpanTermQuery>
 {
 	public override SpanTermQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -107,17 +109,15 @@ public SpanTermQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public string Value { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 }
 
 public sealed partial class SpanTermQueryDescriptor<TDocument> : SerializableDescriptor<SpanTermQueryDescriptor<TDocument>>
 {
 	internal SpanTermQueryDescriptor(Action<SpanTermQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal SpanTermQueryDescriptor() : base()
 	{
 	}
@@ -137,11 +137,8 @@ public SpanTermQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string ValueValue { get; set; }
 
 	public SpanTermQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -203,6 +200,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SpanTermQueryDescriptor : SerializableDescriptor<SpanTermQueryDescriptor>
 {
 	internal SpanTermQueryDescriptor(Action<SpanTermQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal SpanTermQueryDescriptor() : base()
 	{
 	}
@@ -215,11 +213,8 @@ public SpanTermQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string ValueValue { get; set; }
 
 	public SpanTermQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanWithinQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanWithinQuery.g.cs
index 2f264d35895..9bb8c30fd6c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanWithinQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanWithinQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class SpanWithinQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("big")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery Big { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
-
 	[JsonInclude, JsonPropertyName("little")]
 	public Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery Little { get; set; }
 }
@@ -43,24 +42,18 @@ public sealed partial class SpanWithinQuery : SearchQuery
 public sealed partial class SpanWithinQueryDescriptor<TDocument> : SerializableDescriptor<SpanWithinQueryDescriptor<TDocument>>
 {
 	internal SpanWithinQueryDescriptor(Action<SpanWithinQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SpanWithinQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery BigValue { get; set; }
-
 	private SpanQueryDescriptor<TDocument> BigDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>> BigDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery LittleValue { get; set; }
-
 	private SpanQueryDescriptor<TDocument> LittleDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor<TDocument>> LittleDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
 	public SpanWithinQueryDescriptor<TDocument> Big(Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery big)
@@ -177,24 +170,18 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SpanWithinQueryDescriptor : SerializableDescriptor<SpanWithinQueryDescriptor>
 {
 	internal SpanWithinQueryDescriptor(Action<SpanWithinQueryDescriptor> configure) => configure.Invoke(this);
+
 	public SpanWithinQueryDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery BigValue { get; set; }
-
 	private SpanQueryDescriptor BigDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor> BigDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery LittleValue { get; set; }
-
 	private SpanQueryDescriptor LittleDescriptor { get; set; }
-
 	private Action<SpanQueryDescriptor> LittleDescriptorAction { get; set; }
-
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
 
 	public SpanWithinQueryDescriptor Big(Elastic.Clients.Elasticsearch.QueryDsl.SpanQuery big)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermQuery.g.cs
index 42b1c3fa958..df0fa6d17ee 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class TermQueryConverter : JsonConverter<TermQuery>
 {
 	public override TermQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -119,13 +121,9 @@ public TermQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public bool? CaseInsensitive { get; set; }
-
 	public Elastic.Clients.Elasticsearch.FieldValue Value { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(TermQuery termQuery) => QueryDsl.Query.Term(termQuery);
@@ -134,6 +132,7 @@ public TermQuery(Field field)
 public sealed partial class TermQueryDescriptor<TDocument> : SerializableDescriptor<TermQueryDescriptor<TDocument>>
 {
 	internal TermQueryDescriptor(Action<TermQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal TermQueryDescriptor() : base()
 	{
 	}
@@ -153,13 +152,9 @@ public TermQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? CaseInsensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.FieldValue ValueValue { get; set; }
 
 	public TermQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -233,6 +228,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TermQueryDescriptor : SerializableDescriptor<TermQueryDescriptor>
 {
 	internal TermQueryDescriptor(Action<TermQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal TermQueryDescriptor() : base()
 	{
 	}
@@ -245,13 +241,9 @@ public TermQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? CaseInsensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.FieldValue ValueValue { get; set; }
 
 	public TermQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsLookup.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsLookup.g.cs
index 638696f0a70..d94cd2320a5 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsLookup.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsLookup.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class TermsLookup
 {
 	[JsonInclude, JsonPropertyName("id")]
 	public Elastic.Clients.Elasticsearch.Id Id { get; set; }
-
 	[JsonInclude, JsonPropertyName("index")]
 	public Elastic.Clients.Elasticsearch.IndexName Index { get; set; }
-
 	[JsonInclude, JsonPropertyName("path")]
 	public Elastic.Clients.Elasticsearch.Field Path { get; set; }
-
 	[JsonInclude, JsonPropertyName("routing")]
 	public Elastic.Clients.Elasticsearch.Routing? Routing { get; set; }
 }
@@ -43,16 +42,14 @@ public sealed partial class TermsLookup
 public sealed partial class TermsLookupDescriptor<TDocument> : SerializableDescriptor<TermsLookupDescriptor<TDocument>>
 {
 	internal TermsLookupDescriptor(Action<TermsLookupDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TermsLookupDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Id IdValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field PathValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
 
 	public TermsLookupDescriptor<TDocument> Id(Elastic.Clients.Elasticsearch.Id id)
@@ -107,16 +104,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TermsLookupDescriptor : SerializableDescriptor<TermsLookupDescriptor>
 {
 	internal TermsLookupDescriptor(Action<TermsLookupDescriptor> configure) => configure.Invoke(this);
+
 	public TermsLookupDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Id IdValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.IndexName IndexValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field PathValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Routing? RoutingValue { get; set; }
 
 	public TermsLookupDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQuery.g.cs
index 0417f9e428c..658b2cb5e42 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class TermsQueryConverter : JsonConverter<TermsQuery>
 {
 	public override TermsQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -93,11 +95,8 @@ public override void Write(Utf8JsonWriter writer, TermsQuery value, JsonSerializ
 public sealed partial class TermsQuery : SearchQuery
 {
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
-
 	public Elastic.Clients.Elasticsearch.QueryDsl.TermsQueryField Terms { get; set; }
 
 	public static implicit operator Query(TermsQuery termsQuery) => QueryDsl.Query.Terms(termsQuery);
@@ -106,16 +105,14 @@ public sealed partial class TermsQuery : SearchQuery
 public sealed partial class TermsQueryDescriptor<TDocument> : SerializableDescriptor<TermsQueryDescriptor<TDocument>>
 {
 	internal TermsQueryDescriptor(Action<TermsQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public TermsQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.TermsQueryField TermsValue { get; set; }
 
 	public TermsQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -177,16 +174,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TermsQueryDescriptor : SerializableDescriptor<TermsQueryDescriptor>
 {
 	internal TermsQueryDescriptor(Action<TermsQueryDescriptor> configure) => configure.Invoke(this);
+
 	public TermsQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.QueryDsl.TermsQueryField TermsValue { get; set; }
 
 	public TermsQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQueryField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQueryField.g.cs
index 5609fa2181d..23765afb9c4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQueryField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsQueryField.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class TermsQueryField : Union<IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue>, Elastic.Clients.Elasticsearch.QueryDsl.TermsLookup>
 {
 	public TermsQueryField(IReadOnlyCollection<Elastic.Clients.Elasticsearch.FieldValue> value) : base(value)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsSetQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsSetQuery.g.cs
index 8367096d433..c754c79c48a 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsSetQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/TermsSetQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class TermsSetQueryConverter : JsonConverter<TermsSetQuery>
 {
 	public override TermsSetQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -131,15 +133,10 @@ public TermsSetQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field? MinimumShouldMatchField { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Script? MinimumShouldMatchScript { get; set; }
-
 	public ICollection<string> Terms { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(TermsSetQuery termsSetQuery) => QueryDsl.Query.TermsSet(termsSetQuery);
@@ -148,6 +145,7 @@ public TermsSetQuery(Field field)
 public sealed partial class TermsSetQueryDescriptor<TDocument> : SerializableDescriptor<TermsSetQueryDescriptor<TDocument>>
 {
 	internal TermsSetQueryDescriptor(Action<TermsSetQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal TermsSetQueryDescriptor() : base()
 	{
 	}
@@ -167,15 +165,10 @@ public TermsSetQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? MinimumShouldMatchFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? MinimumShouldMatchScriptValue { get; set; }
-
 	private ICollection<string> TermsValue { get; set; }
 
 	public TermsSetQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -267,6 +260,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class TermsSetQueryDescriptor : SerializableDescriptor<TermsSetQueryDescriptor>
 {
 	internal TermsSetQueryDescriptor(Action<TermsSetQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal TermsSetQueryDescriptor() : base()
 	{
 	}
@@ -279,15 +273,10 @@ public TermsSetQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field? MinimumShouldMatchFieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script? MinimumShouldMatchScriptValue { get; set; }
-
 	private ICollection<string> TermsValue { get; set; }
 
 	public TermsSetQueryDescriptor QueryName(string? queryName)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WildcardQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WildcardQuery.g.cs
index 549745d5710..6856ceef3de 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WildcardQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WildcardQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 internal sealed partial class WildcardQueryConverter : JsonConverter<WildcardQuery>
 {
 	public override WildcardQuery Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -147,17 +149,27 @@ public WildcardQuery(Field field)
 	}
 
 	public string? QueryName { get; set; }
-
 	public float? Boost { get; set; }
 
+	/// <summary>
+	/// <para>Allows case insensitive matching of the pattern with the indexed field values when set to true. Default is false which means the case sensitivity of matching depends on the underlying field’s mapping.</para>
+	/// </summary>
 	public bool? CaseInsensitive { get; set; }
 
+	/// <summary>
+	/// <para>Method used to rewrite the query</para>
+	/// </summary>
 	public string? Rewrite { get; set; }
 
+	/// <summary>
+	/// <para>Wildcard pattern for terms you wish to find in the provided field. Required, when wildcard is not set.</para>
+	/// </summary>
 	public string? Value { get; set; }
 
+	/// <summary>
+	/// <para>Wildcard pattern for terms you wish to find in the provided field. Required, when value is not set.</para>
+	/// </summary>
 	public string? Wildcard { get; set; }
-
 	public Elastic.Clients.Elasticsearch.Field Field { get; set; }
 
 	public static implicit operator Query(WildcardQuery wildcardQuery) => QueryDsl.Query.Wildcard(wildcardQuery);
@@ -166,6 +178,7 @@ public WildcardQuery(Field field)
 public sealed partial class WildcardQueryDescriptor<TDocument> : SerializableDescriptor<WildcardQueryDescriptor<TDocument>>
 {
 	internal WildcardQueryDescriptor(Action<WildcardQueryDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	internal WildcardQueryDescriptor() : base()
 	{
 	}
@@ -185,17 +198,11 @@ public WildcardQueryDescriptor(Expression<Func<TDocument, object>> field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? CaseInsensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? RewriteValue { get; set; }
-
 	private string? ValueValue { get; set; }
-
 	private string? WildcardValue { get; set; }
 
 	public WildcardQueryDescriptor<TDocument> QueryName(string? queryName)
@@ -210,6 +217,9 @@ public WildcardQueryDescriptor<TDocument> Boost(float? boost)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Allows case insensitive matching of the pattern with the indexed field values when set to true. Default is false which means the case sensitivity of matching depends on the underlying field’s mapping.</para>
+	/// </summary>
 	public WildcardQueryDescriptor<TDocument> CaseInsensitive(bool? caseInsensitive = true)
 	{
 		CaseInsensitiveValue = caseInsensitive;
@@ -228,18 +238,27 @@ public WildcardQueryDescriptor<TDocument> Field<TValue>(Expression<Func<TDocumen
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Method used to rewrite the query</para>
+	/// </summary>
 	public WildcardQueryDescriptor<TDocument> Rewrite(string? rewrite)
 	{
 		RewriteValue = rewrite;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Wildcard pattern for terms you wish to find in the provided field. Required, when wildcard is not set.</para>
+	/// </summary>
 	public WildcardQueryDescriptor<TDocument> Value(string? value)
 	{
 		ValueValue = value;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Wildcard pattern for terms you wish to find in the provided field. Required, when value is not set.</para>
+	/// </summary>
 	public WildcardQueryDescriptor<TDocument> Wildcard(string? wildcard)
 	{
 		WildcardValue = wildcard;
@@ -297,6 +316,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class WildcardQueryDescriptor : SerializableDescriptor<WildcardQueryDescriptor>
 {
 	internal WildcardQueryDescriptor(Action<WildcardQueryDescriptor> configure) => configure.Invoke(this);
+
 	internal WildcardQueryDescriptor() : base()
 	{
 	}
@@ -309,17 +329,11 @@ public WildcardQueryDescriptor(Field field)
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private bool? CaseInsensitiveValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }
-
 	private string? RewriteValue { get; set; }
-
 	private string? ValueValue { get; set; }
-
 	private string? WildcardValue { get; set; }
 
 	public WildcardQueryDescriptor QueryName(string? queryName)
@@ -334,6 +348,9 @@ public WildcardQueryDescriptor Boost(float? boost)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Allows case insensitive matching of the pattern with the indexed field values when set to true. Default is false which means the case sensitivity of matching depends on the underlying field’s mapping.</para>
+	/// </summary>
 	public WildcardQueryDescriptor CaseInsensitive(bool? caseInsensitive = true)
 	{
 		CaseInsensitiveValue = caseInsensitive;
@@ -358,18 +375,27 @@ public WildcardQueryDescriptor Field<TDocument>(Expression<Func<TDocument, objec
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Method used to rewrite the query</para>
+	/// </summary>
 	public WildcardQueryDescriptor Rewrite(string? rewrite)
 	{
 		RewriteValue = rewrite;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Wildcard pattern for terms you wish to find in the provided field. Required, when wildcard is not set.</para>
+	/// </summary>
 	public WildcardQueryDescriptor Value(string? value)
 	{
 		ValueValue = value;
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>Wildcard pattern for terms you wish to find in the provided field. Required, when value is not set.</para>
+	/// </summary>
 	public WildcardQueryDescriptor Wildcard(string? wildcard)
 	{
 		WildcardValue = wildcard;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WrapperQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WrapperQuery.g.cs
index 4468e5812b0..dfbf622fe98 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WrapperQuery.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/WrapperQuery.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.QueryDsl;
+
 public sealed partial class WrapperQuery : SearchQuery
 {
 	[JsonInclude, JsonPropertyName("_name")]
 	public string? QueryName { get; set; }
-
 	[JsonInclude, JsonPropertyName("boost")]
 	public float? Boost { get; set; }
 
+	/// <summary>
+	/// <para>A base64 encoded query. The binary data format can be any of JSON, YAML, CBOR or SMILE encodings</para>
+	/// </summary>
 	[JsonInclude, JsonPropertyName("query")]
 	public string Query { get; set; }
 
@@ -42,14 +46,13 @@ public sealed partial class WrapperQuery : SearchQuery
 public sealed partial class WrapperQueryDescriptor : SerializableDescriptor<WrapperQueryDescriptor>
 {
 	internal WrapperQueryDescriptor(Action<WrapperQueryDescriptor> configure) => configure.Invoke(this);
+
 	public WrapperQueryDescriptor() : base()
 	{
 	}
 
 	private string? QueryNameValue { get; set; }
-
 	private float? BoostValue { get; set; }
-
 	private string QueryValue { get; set; }
 
 	public WrapperQueryDescriptor QueryName(string? queryName)
@@ -64,6 +67,9 @@ public WrapperQueryDescriptor Boost(float? boost)
 		return Self;
 	}
 
+	/// <summary>
+	/// <para>A base64 encoded query. The binary data format can be any of JSON, YAML, CBOR or SMILE encodings</para>
+	/// </summary>
 	public WrapperQueryDescriptor Query(string query)
 	{
 		QueryValue = query;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RecoveryStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RecoveryStats.g.cs
index 171550d967b..120f68afc24 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RecoveryStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RecoveryStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class RecoveryStats
 {
 	[JsonInclude, JsonPropertyName("current_as_source")]
 	public long CurrentAsSource { get; init; }
-
 	[JsonInclude, JsonPropertyName("current_as_target")]
 	public long CurrentAsTarget { get; init; }
-
 	[JsonInclude, JsonPropertyName("throttle_time")]
 	public Elastic.Clients.Elasticsearch.Duration? ThrottleTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("throttle_time_in_millis")]
 	public long ThrottleTimeInMillis { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RefreshStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RefreshStats.g.cs
index bb9fa4bfb3a..0210232ce4e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RefreshStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RefreshStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class RefreshStats
 {
 	[JsonInclude, JsonPropertyName("external_total")]
 	public long ExternalTotal { get; init; }
-
 	[JsonInclude, JsonPropertyName("external_total_time_in_millis")]
 	public long ExternalTotalTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("listeners")]
 	public long Listeners { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public long Total { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_time")]
 	public Elastic.Clients.Elasticsearch.Duration? TotalTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_time_in_millis")]
 	public long TotalTimeInMillis { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RequestCacheStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RequestCacheStats.g.cs
index 756121f424b..11f9829cc65 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/RequestCacheStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/RequestCacheStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class RequestCacheStats
 {
 	[JsonInclude, JsonPropertyName("evictions")]
 	public long Evictions { get; init; }
-
 	[JsonInclude, JsonPropertyName("hit_count")]
 	public long HitCount { get; init; }
-
 	[JsonInclude, JsonPropertyName("memory_size")]
 	public string? MemorySize { get; init; }
-
 	[JsonInclude, JsonPropertyName("memory_size_in_bytes")]
 	public long MemorySizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("miss_count")]
 	public long MissCount { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Retries.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Retries.g.cs
index ed9a0b7aedc..03ba029d9a9 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Retries.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Retries.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class Retries
 {
 	[JsonInclude, JsonPropertyName("bulk")]
 	public long Bulk { get; init; }
-
 	[JsonInclude, JsonPropertyName("search")]
 	public long Search { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScoreSort.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScoreSort.g.cs
index efbc63a38c7..aced55cec12 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScoreSort.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScoreSort.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ScoreSort
 {
 	[JsonInclude, JsonPropertyName("order")]
@@ -34,6 +36,7 @@ public sealed partial class ScoreSort
 public sealed partial class ScoreSortDescriptor : SerializableDescriptor<ScoreSortDescriptor>
 {
 	internal ScoreSortDescriptor(Action<ScoreSortDescriptor> configure) => configure.Invoke(this);
+
 	public ScoreSortDescriptor() : base()
 	{
 	}
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Script.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Script.g.cs
index cdbe4537051..c14824fc468 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Script.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Script.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class Script : Union<Elastic.Clients.Elasticsearch.InlineScript, Elastic.Clients.Elasticsearch.StoredScriptId>
 {
 	public Script(Elastic.Clients.Elasticsearch.InlineScript inline) : base(inline)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScriptField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScriptField.g.cs
index f08da936096..842a72abb97 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScriptField.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScriptField.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ScriptField
 {
 	[JsonInclude, JsonPropertyName("ignore_failure")]
 	public bool? IgnoreFailure { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script Script { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class ScriptField
 public sealed partial class ScriptFieldDescriptor : SerializableDescriptor<ScriptFieldDescriptor>
 {
 	internal ScriptFieldDescriptor(Action<ScriptFieldDescriptor> configure) => configure.Invoke(this);
+
 	public ScriptFieldDescriptor() : base()
 	{
 	}
 
 	private bool? IgnoreFailureValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script ScriptValue { get; set; }
 
 	public ScriptFieldDescriptor IgnoreFailure(bool? ignoreFailure = true)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScriptSort.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScriptSort.g.cs
index 918755ea682..a0833f7c630 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScriptSort.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ScriptSort.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ScriptSort
 {
 	[JsonInclude, JsonPropertyName("mode")]
 	public Elastic.Clients.Elasticsearch.SortMode? Mode { get; set; }
-
 	[JsonInclude, JsonPropertyName("nested")]
 	public Elastic.Clients.Elasticsearch.NestedSortValue? Nested { get; set; }
-
 	[JsonInclude, JsonPropertyName("order")]
 	public Elastic.Clients.Elasticsearch.SortOrder? Order { get; set; }
-
 	[JsonInclude, JsonPropertyName("script")]
 	public Elastic.Clients.Elasticsearch.Script Script { get; set; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public Elastic.Clients.Elasticsearch.ScriptSortType? Type { get; set; }
 
@@ -48,22 +46,17 @@ public sealed partial class ScriptSort
 public sealed partial class ScriptSortDescriptor<TDocument> : SerializableDescriptor<ScriptSortDescriptor<TDocument>>
 {
 	internal ScriptSortDescriptor(Action<ScriptSortDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public ScriptSortDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.NestedSortValue? NestedValue { get; set; }
-
 	private NestedSortValueDescriptor<TDocument> NestedDescriptor { get; set; }
-
 	private Action<NestedSortValueDescriptor<TDocument>> NestedDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortMode? ModeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortOrder? OrderValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script ScriptValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.ScriptSortType? TypeValue { get; set; }
 
 	public ScriptSortDescriptor<TDocument> Nested(Elastic.Clients.Elasticsearch.NestedSortValue? nested)
@@ -160,22 +153,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class ScriptSortDescriptor : SerializableDescriptor<ScriptSortDescriptor>
 {
 	internal ScriptSortDescriptor(Action<ScriptSortDescriptor> configure) => configure.Invoke(this);
+
 	public ScriptSortDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.NestedSortValue? NestedValue { get; set; }
-
 	private NestedSortValueDescriptor NestedDescriptor { get; set; }
-
 	private Action<NestedSortValueDescriptor> NestedDescriptorAction { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortMode? ModeValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.SortOrder? OrderValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Script ScriptValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.ScriptSortType? TypeValue { get; set; }
 
 	public ScriptSortDescriptor Nested(Elastic.Clients.Elasticsearch.NestedSortValue? nested)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchStats.g.cs
index 9506ddba9f6..0f30d81224e 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SearchStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,61 +25,44 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class SearchStats
 {
 	[JsonInclude, 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; }
-
 	[JsonInclude, JsonPropertyName("fetch_total")]
 	public long FetchTotal { get; init; }
-
 	[JsonInclude, JsonPropertyName("groups")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.SearchStats>? Groups { get; init; }
-
 	[JsonInclude, JsonPropertyName("open_contexts")]
 	public long? OpenContexts { get; init; }
-
 	[JsonInclude, 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; }
-
 	[JsonInclude, JsonPropertyName("query_total")]
 	public long QueryTotal { get; init; }
-
 	[JsonInclude, 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; }
-
 	[JsonInclude, JsonPropertyName("scroll_total")]
 	public long ScrollTotal { get; init; }
-
 	[JsonInclude, 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; }
-
 	[JsonInclude, JsonPropertyName("suggest_total")]
 	public long SuggestTotal { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SegmentsStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SegmentsStats.g.cs
index a2da94f4f1d..e4de3ee48ff 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SegmentsStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SegmentsStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,79 +25,56 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class SegmentsStats
 {
 	[JsonInclude, JsonPropertyName("count")]
 	public int Count { get; init; }
-
 	[JsonInclude, JsonPropertyName("doc_values_memory")]
 	public Elastic.Clients.Elasticsearch.ByteSize? DocValuesMemory { get; init; }
-
 	[JsonInclude, JsonPropertyName("doc_values_memory_in_bytes")]
 	public int DocValuesMemoryInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("file_sizes")]
 	public IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.IndexManagement.ShardFileSizeInfo> FileSizes { get; init; }
-
 	[JsonInclude, JsonPropertyName("fixed_bit_set")]
 	public Elastic.Clients.Elasticsearch.ByteSize? FixedBitSet { get; init; }
-
 	[JsonInclude, JsonPropertyName("fixed_bit_set_memory_in_bytes")]
 	public int FixedBitSetMemoryInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("index_writer_max_memory_in_bytes")]
 	public int? IndexWriterMaxMemoryInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("index_writer_memory")]
 	public Elastic.Clients.Elasticsearch.ByteSize? IndexWriterMemory { get; init; }
-
 	[JsonInclude, JsonPropertyName("index_writer_memory_in_bytes")]
 	public int IndexWriterMemoryInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("max_unsafe_auto_id_timestamp")]
 	public long MaxUnsafeAutoIdTimestamp { get; init; }
-
 	[JsonInclude, JsonPropertyName("memory")]
 	public Elastic.Clients.Elasticsearch.ByteSize? Memory { get; init; }
-
 	[JsonInclude, JsonPropertyName("memory_in_bytes")]
 	public int MemoryInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("norms_memory")]
 	public Elastic.Clients.Elasticsearch.ByteSize? NormsMemory { get; init; }
-
 	[JsonInclude, JsonPropertyName("norms_memory_in_bytes")]
 	public int NormsMemoryInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("points_memory")]
 	public Elastic.Clients.Elasticsearch.ByteSize? PointsMemory { get; init; }
-
 	[JsonInclude, JsonPropertyName("points_memory_in_bytes")]
 	public int PointsMemoryInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("stored_fields_memory_in_bytes")]
 	public int StoredFieldsMemoryInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("stored_memory")]
 	public Elastic.Clients.Elasticsearch.ByteSize? StoredMemory { get; init; }
-
 	[JsonInclude, JsonPropertyName("term_vectors_memory_in_bytes")]
 	public int TermVectorsMemoryInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("term_vectory_memory")]
 	public Elastic.Clients.Elasticsearch.ByteSize? TermVectoryMemory { get; init; }
-
 	[JsonInclude, JsonPropertyName("terms_memory")]
 	public Elastic.Clients.Elasticsearch.ByteSize? TermsMemory { get; init; }
-
 	[JsonInclude, JsonPropertyName("terms_memory_in_bytes")]
 	public int TermsMemoryInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("version_map_memory")]
 	public Elastic.Clients.Elasticsearch.ByteSize? VersionMapMemory { get; init; }
-
 	[JsonInclude, JsonPropertyName("version_map_memory_in_bytes")]
 	public int VersionMapMemoryInBytes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ShardFailure.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ShardFailure.g.cs
index 20c658543ab..7861d307032 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ShardFailure.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ShardFailure.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ShardFailure
 {
 	[JsonInclude, JsonPropertyName("index")]
 	public string? Index { get; init; }
-
 	[JsonInclude, JsonPropertyName("node")]
 	public string? Node { get; init; }
-
 	[JsonInclude, JsonPropertyName("reason")]
 	public Elastic.Clients.Elasticsearch.ErrorCause Reason { get; init; }
-
 	[JsonInclude, JsonPropertyName("shard")]
 	public int Shard { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public string? Status { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ShardStatistics.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ShardStatistics.g.cs
index 863ece296cf..624232ed898 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/ShardStatistics.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/ShardStatistics.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,22 +25,18 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class ShardStatistics
 {
 	[JsonInclude, JsonPropertyName("failed")]
 	public int Failed { get; init; }
-
 	[JsonInclude, JsonPropertyName("failures")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.ShardFailure>? Failures { get; init; }
-
 	[JsonInclude, JsonPropertyName("skipped")]
 	public int? Skipped { get; init; }
-
 	[JsonInclude, JsonPropertyName("successful")]
 	public int Successful { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public int Total { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SlicedScroll.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SlicedScroll.g.cs
index 6f5249c4b1d..276b869289c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SlicedScroll.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SlicedScroll.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class SlicedScroll
 {
 	[JsonInclude, JsonPropertyName("field")]
 	public Elastic.Clients.Elasticsearch.Field? Field { get; set; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public Elastic.Clients.Elasticsearch.Id Id { get; set; }
-
 	[JsonInclude, JsonPropertyName("max")]
 	public int Max { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class SlicedScroll
 public sealed partial class SlicedScrollDescriptor<TDocument> : SerializableDescriptor<SlicedScrollDescriptor<TDocument>>
 {
 	internal SlicedScrollDescriptor(Action<SlicedScrollDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SlicedScrollDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id IdValue { get; set; }
-
 	private int MaxValue { get; set; }
 
 	public SlicedScrollDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field? field)
@@ -94,14 +93,13 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SlicedScrollDescriptor : SerializableDescriptor<SlicedScrollDescriptor>
 {
 	internal SlicedScrollDescriptor(Action<SlicedScrollDescriptor> configure) => configure.Invoke(this);
+
 	public SlicedScrollDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Id IdValue { get; set; }
-
 	private int MaxValue { get; set; }
 
 	public SlicedScrollDescriptor Field(Elastic.Clients.Elasticsearch.Field? field)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slices.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slices.g.cs
index dbe2384ea21..5e9b6410a24 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slices.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Slices.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class Slices : Union<int, Elastic.Clients.Elasticsearch.SlicesCalculation>
 {
 	public Slices(int value) : base(value)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs
index b92d464bb08..1ebfddafa0c 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
@@ -24,8 +26,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 [JsonConverter(typeof(SortOptionsConverter))]
 public sealed partial class SortOptions
 {
@@ -52,9 +54,7 @@ internal SortOptions(Elastic.Clients.Elasticsearch.Field field, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
-
 	internal Elastic.Clients.Elasticsearch.Field? AdditionalPropertyName { get; }
 
 	public static SortOptions Doc(Elastic.Clients.Elasticsearch.ScoreSort scoreSort) => new SortOptions("_doc", scoreSort);
@@ -67,24 +67,19 @@ internal SortOptions(Elastic.Clients.Elasticsearch.Field field, object variant)
 public sealed partial class SortOptionsDescriptor<TDocument> : SerializableDescriptor<SortOptionsDescriptor<TDocument>>
 {
 	internal SortOptionsDescriptor(Action<SortOptionsDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public SortOptionsDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field AdditionalPropertyName { get; set; }
-
 	private Elastic.Clients.Elasticsearch.FieldSort AdditionalPropertyValue { get; set; }
 
-	private SortOptionsDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private SortOptionsDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		AdditionalPropertyValue = null;
 		AdditionalPropertyName = null;
@@ -106,8 +101,7 @@ private SortOptionsDescriptor<TDocument> Set(object variant, string variantName)
 		return Self;
 	}
 
-	private SortOptionsDescriptor<TDocument> Set<T>(Action<T> descriptorAction, Elastic.Clients.Elasticsearch.Field variantName)
-		where T : Descriptor
+	private SortOptionsDescriptor<TDocument> Set<T>(Action<T> descriptorAction, Elastic.Clients.Elasticsearch.Field variantName) where T : Descriptor
 	{
 		var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 		descriptorAction?.Invoke(descriptor);
@@ -144,6 +138,7 @@ private SortOptionsDescriptor<TDocument> Set(Elastic.Clients.Elasticsearch.Field
 	public SortOptionsDescriptor<TDocument> Field(Expression<Func<TDocument, object>> field, Elastic.Clients.Elasticsearch.FieldSort sort) => Set(sort, field);
 	public SortOptionsDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field field, Action<FieldSortDescriptor<TDocument>> configure) => Set(configure, field);
 	public SortOptionsDescriptor<TDocument> Field(Expression<Func<TDocument, object>> field, Action<FieldSortDescriptor<TDocument>> configure) => Set(configure, field);
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -188,24 +183,19 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class SortOptionsDescriptor : SerializableDescriptor<SortOptionsDescriptor>
 {
 	internal SortOptionsDescriptor(Action<SortOptionsDescriptor> configure) => configure.Invoke(this);
+
 	public SortOptionsDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
-
 	private Elastic.Clients.Elasticsearch.Field AdditionalPropertyName { get; set; }
-
 	private Elastic.Clients.Elasticsearch.FieldSort AdditionalPropertyValue { get; set; }
 
-	private SortOptionsDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private SortOptionsDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		AdditionalPropertyValue = null;
 		AdditionalPropertyName = null;
@@ -227,8 +217,7 @@ private SortOptionsDescriptor Set(object variant, string variantName)
 		return Self;
 	}
 
-	private SortOptionsDescriptor Set<T>(Action<T> descriptorAction, Elastic.Clients.Elasticsearch.Field variantName)
-		where T : Descriptor
+	private SortOptionsDescriptor Set<T>(Action<T> descriptorAction, Elastic.Clients.Elasticsearch.Field variantName) where T : Descriptor
 	{
 		var descriptor = (T)Activator.CreateInstance(typeof(T), true);
 		descriptorAction?.Invoke(descriptor);
@@ -264,6 +253,7 @@ private SortOptionsDescriptor Set(Elastic.Clients.Elasticsearch.FieldSort varian
 	public SortOptionsDescriptor Field(Elastic.Clients.Elasticsearch.Field field) => Set(FieldSort.Empty, field);
 	public SortOptionsDescriptor Field(Elastic.Clients.Elasticsearch.Field field, Elastic.Clients.Elasticsearch.FieldSort sort) => Set(sort, field);
 	public SortOptionsDescriptor Field(Elastic.Clients.Elasticsearch.Field field, Action<FieldSortDescriptor> configure) => Set(configure, field);
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Sql/Column.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Sql/Column.g.cs
index 080f2caaa57..5f24db8ce1b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Sql/Column.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Sql/Column.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Sql;
+
 public sealed partial class Column
 {
 	[JsonInclude, JsonPropertyName("name")]
 	public string Name { get; init; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/StopWordsConverter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/StopWordsConverter.g.cs
index 810224da259..3c495f96168 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/StopWordsConverter.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/StopWordsConverter.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 internal sealed class StopWordsConverter : SingleOrManyCollectionConverter<string>
 {
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoreStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoreStats.g.cs
index 68999137a6e..9303afe6585 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoreStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoreStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,25 +25,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class StoreStats
 {
 	[JsonInclude, JsonPropertyName("reserved")]
 	public Elastic.Clients.Elasticsearch.ByteSize? Reserved { get; init; }
-
 	[JsonInclude, JsonPropertyName("reserved_in_bytes")]
 	public int ReservedInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? Size { get; init; }
-
 	[JsonInclude, JsonPropertyName("size_in_bytes")]
 	public int SizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_data_set_size")]
 	public Elastic.Clients.Elasticsearch.ByteSize? TotalDataSetSize { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_data_set_size_in_bytes")]
 	public int? TotalDataSetSizeInBytes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoredScript.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoredScript.g.cs
index 280b7119c41..75cc5581256 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoredScript.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoredScript.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,16 +25,14 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class StoredScript
 {
 	[JsonInclude, JsonPropertyName("lang")]
 	public Elastic.Clients.Elasticsearch.ScriptLanguage Language { get; set; }
-
 	[JsonInclude, JsonPropertyName("options")]
 	public IDictionary<string, string>? Options { get; set; }
-
 	[JsonInclude, JsonPropertyName("source")]
 	public string Source { get; set; }
 }
@@ -40,14 +40,13 @@ public sealed partial class StoredScript
 public sealed partial class StoredScriptDescriptor : SerializableDescriptor<StoredScriptDescriptor>
 {
 	internal StoredScriptDescriptor(Action<StoredScriptDescriptor> configure) => configure.Invoke(this);
+
 	public StoredScriptDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.ScriptLanguage LanguageValue { get; set; }
-
 	private IDictionary<string, string>? OptionsValue { get; set; }
-
 	private string SourceValue { get; set; }
 
 	public StoredScriptDescriptor Language(Elastic.Clients.Elasticsearch.ScriptLanguage language)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoredScriptId.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoredScriptId.g.cs
index e2dc3cc2b2f..addc935ca7b 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoredScriptId.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoredScriptId.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class StoredScriptId
 {
 	[JsonInclude, JsonPropertyName("id")]
 	public Elastic.Clients.Elasticsearch.Id Id { get; set; }
-
 	[JsonInclude, JsonPropertyName("params")]
 	public IDictionary<string, object>? Params { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class StoredScriptId
 public sealed partial class StoredScriptIdDescriptor : SerializableDescriptor<StoredScriptIdDescriptor>
 {
 	internal StoredScriptIdDescriptor(Action<StoredScriptIdDescriptor> configure) => configure.Invoke(this);
+
 	public StoredScriptIdDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.Id IdValue { get; set; }
-
 	private IDictionary<string, object>? ParamsValue { get; set; }
 
 	public StoredScriptIdDescriptor Id(Elastic.Clients.Elasticsearch.Id id)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TaskFailure.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TaskFailure.g.cs
index 412ed390655..80b25b47fa1 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TaskFailure.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TaskFailure.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class TaskFailure
 {
 	[JsonInclude, JsonPropertyName("node_id")]
 	public string NodeId { get; init; }
-
 	[JsonInclude, JsonPropertyName("reason")]
 	public Elastic.Clients.Elasticsearch.ErrorCause Reason { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public string Status { get; init; }
-
 	[JsonInclude, JsonPropertyName("task_id")]
 	public long TaskId { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/NodeTasks.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/NodeTasks.g.cs
index 9656bdcd14c..a7d91837797 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/NodeTasks.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/NodeTasks.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Tasks;
+
 public sealed partial class NodeTasks
 {
 	[JsonInclude, JsonPropertyName("attributes")]
 	public IReadOnlyDictionary<string, string>? Attributes { get; init; }
-
 	[JsonInclude, JsonPropertyName("host")]
 	public string? Host { get; init; }
-
 	[JsonInclude, JsonPropertyName("ip")]
 	public string? Ip { get; init; }
-
 	[JsonInclude, JsonPropertyName("name")]
 	public string? Name { get; init; }
-
 	[JsonInclude, JsonPropertyName("roles")]
 	public IReadOnlyCollection<string>? Roles { get; init; }
-
 	[JsonInclude, JsonPropertyName("tasks")]
 	public IReadOnlyDictionary<Elastic.Clients.Elasticsearch.TaskId, Elastic.Clients.Elasticsearch.Tasks.TaskInfo> Tasks { get; init; }
-
 	[JsonInclude, JsonPropertyName("transport_address")]
 	public string? TransportAddress { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/ParentTaskInfo.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/ParentTaskInfo.g.cs
index c92b742eff0..01ec0b5f3a2 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/ParentTaskInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/ParentTaskInfo.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,49 +25,36 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Tasks;
+
 public sealed partial class ParentTaskInfo
 {
 	[JsonInclude, JsonPropertyName("action")]
 	public string Action { get; init; }
-
 	[JsonInclude, JsonPropertyName("cancellable")]
 	public bool Cancellable { get; init; }
-
 	[JsonInclude, JsonPropertyName("cancelled")]
 	public bool? Cancelled { get; init; }
-
 	[JsonInclude, JsonPropertyName("children")]
 	public IReadOnlyCollection<Elastic.Clients.Elasticsearch.Tasks.TaskInfo>? Children { get; init; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
-
 	[JsonInclude, JsonPropertyName("headers")]
 	public IReadOnlyDictionary<string, string> Headers { get; init; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public long Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("node")]
 	public string Node { get; init; }
-
 	[JsonInclude, JsonPropertyName("parent_task_id")]
 	public Elastic.Clients.Elasticsearch.TaskId? ParentTaskId { get; init; }
-
 	[JsonInclude, JsonPropertyName("running_time")]
 	public Elastic.Clients.Elasticsearch.Duration? RunningTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("running_time_in_nanos")]
 	public long RunningTimeInNanos { get; init; }
-
 	[JsonInclude, JsonPropertyName("start_time_in_millis")]
 	public long StartTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.Tasks.TaskStatus? Status { get; init; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
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 caf0851ddb9..7d189518243 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskInfo.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskInfo.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,46 +25,34 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Tasks;
+
 public sealed partial class TaskInfo
 {
 	[JsonInclude, JsonPropertyName("action")]
 	public string Action { get; init; }
-
 	[JsonInclude, JsonPropertyName("cancellable")]
 	public bool Cancellable { get; init; }
-
 	[JsonInclude, JsonPropertyName("cancelled")]
 	public bool? Cancelled { get; init; }
-
 	[JsonInclude, JsonPropertyName("description")]
 	public string? Description { get; init; }
-
 	[JsonInclude, JsonPropertyName("headers")]
 	public IReadOnlyDictionary<string, string> Headers { get; init; }
-
 	[JsonInclude, JsonPropertyName("id")]
 	public long Id { get; init; }
-
 	[JsonInclude, JsonPropertyName("node")]
 	public string Node { get; init; }
-
 	[JsonInclude, JsonPropertyName("parent_task_id")]
 	public Elastic.Clients.Elasticsearch.TaskId? ParentTaskId { get; init; }
-
 	[JsonInclude, JsonPropertyName("running_time")]
 	public Elastic.Clients.Elasticsearch.Duration? RunningTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("running_time_in_nanos")]
 	public long RunningTimeInNanos { get; init; }
-
 	[JsonInclude, JsonPropertyName("start_time_in_millis")]
 	public long StartTimeInMillis { get; init; }
-
 	[JsonInclude, JsonPropertyName("status")]
 	public Elastic.Clients.Elasticsearch.Tasks.TaskStatus? Status { get; init; }
-
 	[JsonInclude, JsonPropertyName("type")]
 	public string Type { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskInfos.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskInfos.g.cs
index cc8bcaf95cb..1db7ebe55df 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskInfos.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskInfos.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Core;
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -26,8 +28,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Tasks;
+
 public sealed partial class TaskInfos : Union<IReadOnlyCollection<Elastic.Clients.Elasticsearch.Tasks.TaskInfo>, IReadOnlyDictionary<string, Elastic.Clients.Elasticsearch.Tasks.ParentTaskInfo>>
 {
 	public TaskInfos(IReadOnlyCollection<Elastic.Clients.Elasticsearch.Tasks.TaskInfo> flat) : base(flat)
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 ab5feeeed6b..deb2513da69 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskStatus.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Tasks/TaskStatus.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,58 +25,42 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.Tasks;
+
 public sealed partial class TaskStatus
 {
 	[JsonInclude, JsonPropertyName("batches")]
 	public long Batches { get; init; }
-
 	[JsonInclude, JsonPropertyName("canceled")]
 	public string? Canceled { get; init; }
-
 	[JsonInclude, JsonPropertyName("created")]
 	public long Created { get; init; }
-
 	[JsonInclude, JsonPropertyName("deleted")]
 	public long Deleted { get; init; }
-
 	[JsonInclude, JsonPropertyName("failures")]
 	public IReadOnlyCollection<string>? Failures { get; init; }
-
 	[JsonInclude, JsonPropertyName("noops")]
 	public long Noops { get; init; }
-
 	[JsonInclude, JsonPropertyName("requests_per_second")]
 	public float RequestsPerSecond { get; init; }
-
 	[JsonInclude, 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; }
-
 	[JsonInclude, JsonPropertyName("timed_out")]
 	public bool? TimedOut { get; init; }
-
 	[JsonInclude, JsonPropertyName("took")]
 	public long? Took { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public long Total { get; init; }
-
 	[JsonInclude, JsonPropertyName("updated")]
 	public long Updated { get; init; }
-
 	[JsonInclude, JsonPropertyName("version_conflicts")]
 	public long VersionConflicts { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TopLeftBottomRightGeoBounds.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TopLeftBottomRightGeoBounds.g.cs
index 23f6825a7ea..b4b6c717942 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TopLeftBottomRightGeoBounds.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TopLeftBottomRightGeoBounds.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class TopLeftBottomRightGeoBounds
 {
 	[JsonInclude, JsonPropertyName("bottom_right")]
 	public Elastic.Clients.Elasticsearch.GeoLocation BottomRight { get; set; }
-
 	[JsonInclude, JsonPropertyName("top_left")]
 	public Elastic.Clients.Elasticsearch.GeoLocation TopLeft { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class TopLeftBottomRightGeoBounds
 public sealed partial class TopLeftBottomRightGeoBoundsDescriptor : SerializableDescriptor<TopLeftBottomRightGeoBoundsDescriptor>
 {
 	internal TopLeftBottomRightGeoBoundsDescriptor(Action<TopLeftBottomRightGeoBoundsDescriptor> configure) => configure.Invoke(this);
+
 	public TopLeftBottomRightGeoBoundsDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.GeoLocation BottomRightValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoLocation TopLeftValue { get; set; }
 
 	public TopLeftBottomRightGeoBoundsDescriptor BottomRight(Elastic.Clients.Elasticsearch.GeoLocation bottomRight)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TopRightBottomLeftGeoBounds.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TopRightBottomLeftGeoBounds.g.cs
index b169d12949a..4f92bf66e0f 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TopRightBottomLeftGeoBounds.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TopRightBottomLeftGeoBounds.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,13 +25,12 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class TopRightBottomLeftGeoBounds
 {
 	[JsonInclude, JsonPropertyName("bottom_left")]
 	public Elastic.Clients.Elasticsearch.GeoLocation BottomLeft { get; set; }
-
 	[JsonInclude, JsonPropertyName("top_right")]
 	public Elastic.Clients.Elasticsearch.GeoLocation TopRight { get; set; }
 }
@@ -37,12 +38,12 @@ public sealed partial class TopRightBottomLeftGeoBounds
 public sealed partial class TopRightBottomLeftGeoBoundsDescriptor : SerializableDescriptor<TopRightBottomLeftGeoBoundsDescriptor>
 {
 	internal TopRightBottomLeftGeoBoundsDescriptor(Action<TopRightBottomLeftGeoBoundsDescriptor> configure) => configure.Invoke(this);
+
 	public TopRightBottomLeftGeoBoundsDescriptor() : base()
 	{
 	}
 
 	private Elastic.Clients.Elasticsearch.GeoLocation BottomLeftValue { get; set; }
-
 	private Elastic.Clients.Elasticsearch.GeoLocation TopRightValue { get; set; }
 
 	public TopRightBottomLeftGeoBoundsDescriptor BottomLeft(Elastic.Clients.Elasticsearch.GeoLocation bottomLeft)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupBy.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupBy.g.cs
index 3bdd48d00f6..d5aa49dbbb3 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupBy.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupBy.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch.TransformManagement;
+
 [JsonConverter(typeof(PivotGroupByConverter))]
 public sealed partial class PivotGroupBy
 {
@@ -41,7 +43,6 @@ internal PivotGroupBy(string variantName, object variant)
 	}
 
 	internal object Variant { get; }
-
 	internal string VariantName { get; }
 
 	public static PivotGroupBy DateHistogram(Elastic.Clients.Elasticsearch.Aggregations.DateHistogramAggregation dateHistogramAggregation) => new PivotGroupBy("date_histogram", dateHistogramAggregation);
@@ -114,20 +115,17 @@ public override void Write(Utf8JsonWriter writer, PivotGroupBy value, JsonSerial
 public sealed partial class PivotGroupByDescriptor<TDocument> : SerializableDescriptor<PivotGroupByDescriptor<TDocument>>
 {
 	internal PivotGroupByDescriptor(Action<PivotGroupByDescriptor<TDocument>> configure) => configure.Invoke(this);
+
 	public PivotGroupByDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private PivotGroupByDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private PivotGroupByDescriptor<TDocument> Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -151,6 +149,7 @@ private PivotGroupByDescriptor<TDocument> Set(object variant, string variantName
 	public PivotGroupByDescriptor<TDocument> Histogram(Action<Aggregations.HistogramAggregationDescriptor<TDocument>> configure) => Set(configure, "histogram");
 	public PivotGroupByDescriptor<TDocument> Terms(Aggregations.TermsAggregation termsAggregation) => Set(termsAggregation, "terms");
 	public PivotGroupByDescriptor<TDocument> Terms(Action<Aggregations.TermsAggregationDescriptor<TDocument>> configure) => Set(configure, "terms");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
@@ -176,20 +175,17 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 public sealed partial class PivotGroupByDescriptor : SerializableDescriptor<PivotGroupByDescriptor>
 {
 	internal PivotGroupByDescriptor(Action<PivotGroupByDescriptor> configure) => configure.Invoke(this);
+
 	public PivotGroupByDescriptor() : base()
 	{
 	}
 
 	private bool ContainsVariant { get; set; }
-
 	private string ContainedVariantName { get; set; }
-
 	private object Variant { get; set; }
-
 	private Descriptor Descriptor { get; set; }
 
-	private PivotGroupByDescriptor Set<T>(Action<T> descriptorAction, string variantName)
-		where T : Descriptor
+	private PivotGroupByDescriptor Set<T>(Action<T> descriptorAction, string variantName) where T : Descriptor
 	{
 		ContainedVariantName = variantName;
 		ContainsVariant = true;
@@ -216,6 +212,7 @@ private PivotGroupByDescriptor Set(object variant, string variantName)
 	public PivotGroupByDescriptor Terms(Aggregations.TermsAggregation termsAggregation) => Set(termsAggregation, "terms");
 	public PivotGroupByDescriptor Terms(Action<Aggregations.TermsAggregationDescriptor> configure) => Set(configure, "terms");
 	public PivotGroupByDescriptor Terms<TDocument>(Action<Aggregations.TermsAggregationDescriptor<TDocument>> configure) => Set(configure, "terms");
+
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
 	{
 		if (!ContainsVariant)
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TranslogStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TranslogStats.g.cs
index ba250d336a4..47e080f8c36 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TranslogStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TranslogStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,28 +25,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class TranslogStats
 {
 	[JsonInclude, JsonPropertyName("earliest_last_modified_age")]
 	public long EarliestLastModifiedAge { get; init; }
-
 	[JsonInclude, JsonPropertyName("operations")]
 	public long Operations { get; init; }
-
 	[JsonInclude, JsonPropertyName("size")]
 	public string? Size { get; init; }
-
 	[JsonInclude, JsonPropertyName("size_in_bytes")]
 	public long SizeInBytes { get; init; }
-
 	[JsonInclude, JsonPropertyName("uncommitted_operations")]
 	public int UncommittedOperations { get; init; }
-
 	[JsonInclude, JsonPropertyName("uncommitted_size")]
 	public string? UncommittedSize { get; init; }
-
 	[JsonInclude, JsonPropertyName("uncommitted_size_in_bytes")]
 	public long UncommittedSizeInBytes { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/WarmerStats.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/WarmerStats.g.cs
index 232e245e10e..04da0755db4 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/WarmerStats.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/WarmerStats.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,19 +25,16 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class WarmerStats
 {
 	[JsonInclude, JsonPropertyName("current")]
 	public long Current { get; init; }
-
 	[JsonInclude, JsonPropertyName("total")]
 	public long Total { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_time")]
 	public Elastic.Clients.Elasticsearch.Duration? TotalTime { get; init; }
-
 	[JsonInclude, JsonPropertyName("total_time_in_millis")]
 	public long TotalTimeInMillis { get; init; }
 }
\ No newline at end of file
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/WktGeoBounds.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/WktGeoBounds.g.cs
index 039e1136ac8..284e190233d 100644
--- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/WktGeoBounds.g.cs
+++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/WktGeoBounds.g.cs
@@ -15,6 +15,8 @@
 //
 // ------------------------------------------------
 
+#nullable restore
+
 using Elastic.Clients.Elasticsearch.Fluent;
 using Elastic.Clients.Elasticsearch.Serialization;
 using System;
@@ -23,8 +25,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-#nullable restore
 namespace Elastic.Clients.Elasticsearch;
+
 public sealed partial class WktGeoBounds
 {
 	[JsonInclude, JsonPropertyName("wkt")]
@@ -34,6 +36,7 @@ public sealed partial class WktGeoBounds
 public sealed partial class WktGeoBoundsDescriptor : SerializableDescriptor<WktGeoBoundsDescriptor>
 {
 	internal WktGeoBoundsDescriptor(Action<WktGeoBoundsDescriptor> configure) => configure.Invoke(this);
+
 	public WktGeoBoundsDescriptor() : base()
 	{
 	}